Skip to content

[enh] Safari support - initial proof of concept #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ellieayla wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[enh] Safari support - initial proof of concept #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manage.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ build_addon() {
echo "[!] Warning: The default manifest.json is for chrome browsers, overwrite it with manifest_ff.json for firefox"
cd ext
npm run build
xcrun safari-web-extension-packager ./dist --project-location ./xc-project --app-name Hister
cd ..
}

Expand Down
22 changes: 22 additions & 0 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ func (lrw *loggingResponseWriter) Hijack() (net.Conn, *bufio.ReadWriter, error)
func (c *csrfExceptionHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
if r.URL.Path == "/add" && strings.HasPrefix(r.Header.Get("Origin"), "moz-extension://") {
c.origHandler.ServeHTTP(w, r)
} else if r.URL.Path == "/add" && strings.HasPrefix(r.Header.Get("Origin"), "safari-web-extension://") {
c.origHandler.ServeHTTP(w, r)
} else {
c.csrfHandler.ServeHTTP(w, r)
}
Expand Down Expand Up @@ -337,6 +339,21 @@ func serveAdd(c *webContext) {
c.Render("add", nil)
return
}
if m == http.MethodOptions {
if c.Request.Header.Get("Access-Control-Request-Method") != http.MethodPost {
c.Response.WriteHeader(http.StatusForbidden)
return
}
origin := c.Request.Header.Get("Origin")
if strings.HasPrefix(origin, "safari-web-extension://") {
c.Response.Header().Add("Access-Control-Allow-Origin", origin)
}
c.Response.Header().Add("Access-Control-Allow-Methods", http.MethodPost)
c.Response.Header().Add("Access-Control-Allow-Headers", "Content-Type")
c.Response.Header().Add("Access-Control-Max-Age", "86400")
c.Response.WriteHeader(http.StatusNoContent)
return
}
if m != http.MethodPost {
serve500(c)
return
Expand All @@ -361,6 +378,7 @@ func serveAdd(c *webContext) {
d.Title = f.Get("title")
d.Text = f.Get("text")
}

if !c.Config.Rules.IsSkip(d.URL) && !strings.HasPrefix(d.URL, c.Config.BaseURL("/")) {
if err := d.Process(); err != nil {
log.Error().Err(err).Str("URL", d.URL).Msg("failed to process document")
Expand All @@ -373,6 +391,10 @@ func serveAdd(c *webContext) {
serve500(c)
return
}
origin := c.Request.Header.Get("Origin")
if strings.HasPrefix(origin, "safari-web-extension://") {
c.Response.Header().Add("Access-Control-Allow-Origin", origin)
}
c.Response.WriteHeader(http.StatusCreated)
} else {
log.Debug().Str("url", d.URL).Msg("skip indexing")
Expand Down