Allow URLs without hostname setting it to (none) (#1335)

pull/1345/head
RobertJoonas 5 years ago committed by GitHub
parent 7e772151e3
commit 4742e05ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -2,7 +2,7 @@ install:
mix deps.get
mix ecto.create
mix ecto.migrate
npm ci --prefix assets
npm install --prefix assets
server:
mix phx.server

@ -2607,7 +2607,6 @@
"dependencies": {
"anymatch": "~3.1.1",
"braces": "~3.0.2",
"fsevents": "~2.3.1",
"glob-parent": "~5.1.0",
"is-binary-path": "~2.1.0",
"is-glob": "~4.0.1",
@ -3560,8 +3559,7 @@
"esprima": "^3.1.3",
"estraverse": "^4.2.0",
"esutils": "^2.0.2",
"optionator": "^0.8.1",
"source-map": "~0.6.1"
"optionator": "^0.8.1"
},
"bin": {
"escodegen": "bin/escodegen.js",
@ -5342,7 +5340,6 @@
"version": "6.1.0",
"license": "MIT",
"dependencies": {
"graceful-fs": "^4.1.6",
"universalify": "^2.0.0"
},
"optionalDependencies": {
@ -8161,8 +8158,7 @@
"esprima": "^4.0.1",
"estraverse": "^4.2.0",
"esutils": "^2.0.2",
"optionator": "^0.8.1",
"source-map": "~0.6.1"
"optionator": "^0.8.1"
},
"bin": {
"escodegen": "bin/escodegen.js",

@ -73,6 +73,7 @@ defmodule PlausibleWeb.Api.ExternalController do
:ok
else
uri = params["url"] && URI.parse(params["url"])
host = if uri && uri.host == "", do: "(none)", else: uri && uri.host
query = if uri && uri.query, do: URI.decode_query(uri.query), else: %{}
ref = parse_referrer(uri, params["referrer"])
@ -82,7 +83,7 @@ defmodule PlausibleWeb.Api.ExternalController do
event_attrs = %{
timestamp: NaiveDateTime.utc_now() |> NaiveDateTime.truncate(:second),
name: params["name"],
hostname: strip_www(uri && uri.host),
hostname: strip_www(host),
pathname: get_pathname(uri, params["hash_mode"]),
referrer_source: get_referrer_source(query, ref),
referrer: clean_referrer(ref),

@ -840,6 +840,24 @@ defmodule PlausibleWeb.Api.ExternalControllerTest do
end
end
test "defaults hostname to (none) when missing", %{conn: conn} do
params = %{
domain: "url-with-hostname-missing.com",
name: "pageview",
url: "file:///android_asset/www/index.html"
}
conn =
conn
|> put_req_header("content-type", "text/plain")
|> post("/api/event", Jason.encode!(params))
pageview = get_event("url-with-hostname-missing.com")
assert response(conn, 202) == ""
assert pageview.hostname == "(none)"
end
describe "GET /api/health" do
test "returns 200 OK", %{conn: conn} do
conn = get(conn, "/api/health")

Loading…
Cancel
Save