Merge pull request #70 from parkr/log-path-from-js

pingv2: create a mechanism to send an XHR request with full path

cors.go

@@ -26,7 +26,7 @@ func (c *corsHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 }
 
 func addCorsHeaders(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set(CorsAccessControlAllowMethodsHeaderName, "GET")
+	w.Header().Set(CorsAccessControlAllowMethodsHeaderName, "GET, POST")
 	if allowCORSOrigin(r.Header.Get("Origin")) {
 		w.Header().Set(CorsAccessControlAllowOriginHeaderName, r.Header.Get("Origin"))
 	} else if allowCORSOrigin(r.Referer()) {

cors_test.go

@@ -18,7 +18,7 @@ func TestAddCorsHeaders_OriginRequestHeader_Success(t *testing.T) {
 
 	addCorsHeaders(recorder, request)
 
-	expectedAllowedMethods := "GET"
+	expectedAllowedMethods := "GET, POST"
 	actual := recorder.Header().Get(CorsAccessControlAllowMethodsHeaderName)
 	if actual != expectedAllowedMethods {
 		t.Errorf("expected %s: %v, got: %v", CorsAccessControlAllowMethodsHeaderName, expectedAllowedMethods, actual)
@@ -43,7 +43,7 @@ func TestAddCorsHeaders_RefererRequestHeader_Success(t *testing.T) {
 
 	addCorsHeaders(recorder, request)
 
-	expectedAllowedMethods := "GET"
+	expectedAllowedMethods := "GET, POST"
 	actual := recorder.Header().Get(CorsAccessControlAllowMethodsHeaderName)
 	if actual != expectedAllowedMethods {
 		t.Errorf("expected %s: %v, got: %v", CorsAccessControlAllowMethodsHeaderName, expectedAllowedMethods, actual)
@@ -68,7 +68,7 @@ func TestAddCorsHeaders_NeitherRequestHeader_Success(t *testing.T) {
 
 	addCorsHeaders(recorder, request)
 
-	expectedAllowedMethods := "GET"
+	expectedAllowedMethods := "GET, POST"
 	actual := recorder.Header().Get(CorsAccessControlAllowMethodsHeaderName)
 	if actual != expectedAllowedMethods {
 		t.Errorf("expected %s: %v, got: %v", CorsAccessControlAllowMethodsHeaderName, expectedAllowedMethods, actual)
@@ -93,7 +93,7 @@ func TestAddCorsHeaders_UnparseableRequestHeader_Success(t *testing.T) {
 
 	addCorsHeaders(recorder, request)
 
-	expectedAllowedMethods := "GET"
+	expectedAllowedMethods := "GET, POST"
 	actual := recorder.Header().Get(CorsAccessControlAllowMethodsHeaderName)
 	if actual != expectedAllowedMethods {
 		t.Errorf("expected %s: %v, got: %v", CorsAccessControlAllowMethodsHeaderName, expectedAllowedMethods, actual)

database/database.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"fmt"
+	"log"
 	"os"
 
 	"github.com/jmoiron/sqlx"
@@ -22,6 +23,7 @@ const (
 	);`
 	checkIfSchemaExists = `SELECT COUNT(*) as does_exist FROM sqlite_master WHERE type='table' AND name='visits';`
 	insertVisit         = `INSERT INTO visits (ip, host, path, user_agent, created_at) VALUES (:ip, :host, :path, :user_agent, :created_at)`
+	selectVisit         = `SELECT ip, host, path, user_agent, created_at FROM visits WHERE id = ?`
 )
 
 type TableCheck struct {
@@ -48,6 +50,16 @@ func Initialize() (*sqlx.DB, error) {
 	return db, nil
 }
 
+func Get(db *sqlx.DB, id int) (Visit, error) {
+	row := db.QueryRow(selectVisit, id)
+	if row.Err() != nil {
+		return Visit{}, row.Err()
+	}
+	visit := Visit{}
+	err := row.Scan(&visit.IP, &visit.Host, &visit.Path, &visit.UserAgent, &visit.CreatedAt)
+	return visit, err
+}
+
 type Visit struct {
 	IP        string `db:"ip"`
 	Host      string `db:"host"`
@@ -61,6 +73,8 @@ func (v *Visit) String() string {
 }
 
 func (v *Visit) Save(db *sqlx.DB) error {
-	_, err := db.NamedExec(insertVisit, v)
+	result, err := db.NamedExec(insertVisit, v)
+	lastInsertedId, _ := result.LastInsertId()
+	log.Println("inserted id", lastInsertedId)
 	return err
 }

dnt/do_not_track.go

@@ -0,0 +1,14 @@
+package dnt
+
+import "net/http"
+
+const DoNotTrackHeaderName = "DNT"
+const DoNotTrackHeaderValue = "1"
+
+func RequestsDoNotTrack(r *http.Request) bool {
+	return r.Header.Get(DoNotTrackHeaderName) == DoNotTrackHeaderValue
+}
+
+func SetDoNotTrack(w http.ResponseWriter) {
+	w.Header().Set(DoNotTrackHeaderName, DoNotTrackHeaderValue)
+}

do_not_track_test.go → dnt/do_not_track_test.go

@@ -1,4 +1,4 @@
-package main
+package dnt
 
 import (
 	"net/http"
@@ -17,7 +17,7 @@ func TestRequestsDoNotTrack(t *testing.T) {
 		"Dnt": {DoNotTrackHeaderValue},
 	})}
 
-	if !requestsDoNotTrack(req) {
+	if !RequestsDoNotTrack(req) {
 		t.Fatalf("expected DNT header to be respected, headers: %+v, %s header: %+v",
 			req.Header,
 			textproto.CanonicalMIMEHeaderKey(DoNotTrackHeaderName),
@@ -27,16 +27,16 @@ func TestRequestsDoNotTrack(t *testing.T) {
 	// Header is not set. We can track this request.
 	req = &http.Request{Header: map[string][]string{}}
 
-	if requestsDoNotTrack(req) {
+	if RequestsDoNotTrack(req) {
 		t.Fatalf("expected lack of DNT header to mean we can track")
 	}
 
 	// Header is not set correctly. We can track this request.
 	req = &http.Request{Header: map[string][]string{
-		"Dnt": []string{"!"},
+		"Dnt": {"!"},
 	}}
 
-	if requestsDoNotTrack(req) {
+	if RequestsDoNotTrack(req) {
 		t.Fatalf("expected value of DNT header to mean we can track")
 	}
 }

jsv1/version1.go

@@ -0,0 +1,32 @@
+package jsv1
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/parkr/ping/dnt"
+)
+
+const returnedJavaScript = "(function(){})();"
+const lengthOfJavaScript = "17"
+
+func Write(w http.ResponseWriter, code int) {
+	w.WriteHeader(code)
+	w.Header().Set("Content-Type", "application/javascript")
+	w.Header().Set("Content-Length", lengthOfJavaScript)
+	fmt.Fprintf(w, returnedJavaScript)
+}
+
+func DoNotTrack(w http.ResponseWriter) {
+	Write(w, http.StatusOK)
+	dnt.SetDoNotTrack(w)
+}
+
+func Error(w http.ResponseWriter, code int, err string) {
+	w.WriteHeader(code)
+	content := fmt.Sprintf(`(function(){console.error("%s")})();`, err)
+	w.Header().Set("Content-Type", "application/javascript")
+	w.Header().Set("Content-Length", strconv.Itoa(len(content)))
+	fmt.Fprintf(w, content)
+}

jsv2/version2.go

@@ -0,0 +1,44 @@
+package jsv2
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+)
+
+const returnedJavaScript = `
+function logVisit(document) {
+	var httpRequest = new XMLHttpRequest();
+	httpRequest.onreadystatechange = () => {
+		if (httpRequest.readyState === XMLHttpRequest.DONE) {
+			if (httpRequest.status > 100 && httpRequest.status < 300) {
+				console.log("visit log result:", httpRequest.responseText)
+			} else {
+				console.error('There was a problem with the request.')
+				console.error(httpRequest.status, httpRequest.responseText, httpRequest)
+			}
+		}
+	};
+	const visitSearchParams = new URLSearchParams()
+	visitSearchParams.append('host', document.location.hostname)
+	visitSearchParams.append('path', document.location.pathname)
+	const visitURL = new URL('https://ping.parkermoo.re/submit.js')
+	visitURL.search = "?" + visitSearchParams.toString()
+	httpRequest.open('POST', visitURL.toString(), true);
+	httpRequest.send();
+}
+(function(){
+	document.addEventListener('readystatechange', (event) => {
+		if (document.readyState === 'complete') {
+			logVisit(document)
+		}
+	});
+})()
+`
+
+func Write(w http.ResponseWriter, code int) {
+	w.WriteHeader(code)
+	w.Header().Set("Content-Type", "application/javascript")
+	w.Header().Set("Content-Length", strconv.Itoa(len(returnedJavaScript)))
+	fmt.Fprintf(w, returnedJavaScript)
+}