TODO

Fix serving . but absolute and parents still cause bugs
todo
2019-11-06 17:19:57 -07:00 · 2019-10-21 09:52:05 -06:00 · 2019-10-20 17:34:02 -06:00 · 2019-10-20 16:39:26 -06:00 · 2019-10-20 02:27:28 +00:00 · 2019-10-20 02:16:41 +00:00
7 changed files with 53 additions and 9 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ gollum
 *.sw*
 **/*.sw*
 notes-server
+exec-notes-server
--- a/16
+++ b/16
@@ -0,0 +1,16 @@
+
+FROM golang:1.13-alpine as certs
+RUN apk update && apk add --no-cache ca-certificates
+
+FROM busybox:glibc
+RUN mkdir -p /var/log
+WORKDIR /main
+COPY --from=certs /etc/ssl/certs /etc/ssl/certs
+
+COPY . .
+
+ENV GOPATH=""
+ENV MNT="/mnt/"
+ENTRYPOINT ["/main/exec-notes-server"]
+CMD []
+
--- a/3
+++ b/3
@@ -5,3 +5,6 @@ x  create dir
 TOC levels
 delete pages
 search
+move auth as flag in router
+. and ../** as roots cause bugs in listing and loading and linking
+`create` at root is a 400, base= in URL (when `create` input is empty)
--- a/config/config.go
+++ b/config/config.go
@@ -15,6 +15,7 @@ var (
 	Port        string
 	Head        string
 	Foot        string
+	OAuthServer string
 )

 func init() {
@@ -30,6 +31,7 @@ func Refresh() {
 	as.Append(args.STRING, "root", "root dir path", "./public")
 	as.Append(args.STRING, "port", "port to listen on", "39909")
 	as.Append(args.STRING, "wrap", "file with http header/footer", "./wrapper.html")
+	as.Append(args.STRING, "oauth", "oauth URL", "")
 	if err := as.Parse(); err != nil {
 		panic(err)
 	}
@@ -49,4 +51,5 @@ func Refresh() {
 	Port = ":" + strings.TrimPrefix(as.Get("port").GetString(), ":")
 	Head = string(bs[0])
 	Foot = string(bs[1])
+	OAuthServer = as.Get("oauth").GetString()
 }
--- a/server/path.go
+++ b/server/path.go
@@ -18,8 +18,10 @@ type Path struct {
 func NewPathFromLocal(p string) Path {
 	splits := strings.SplitN(p, path.Base(config.Root), 2)
 	href := splits[0]
-	if len(splits) > 1 {
+	if len(splits) > 1 && splits[0] == "" {
 		href = splits[1]
+	} else {
+		href = strings.Join(splits, path.Base(config.Root))
 	}
 	href = path.Join("/notes", href)
 	return NewPathFromURL(href)
--- a/server/routes.go
+++ b/server/routes.go
@@ -2,7 +2,10 @@ package server

 import (
 	"fmt"
+	"local/notes-server/config"
+	"local/oauth2/oauth2client"
 	"local/router"
+	"log"
 	"net/http"
 )

@@ -14,19 +17,19 @@ func (s *Server) Routes() error {
 	}{
 		{
 			path:    fmt.Sprintf("notes/%s%s", wildcard, wildcard),
-			handler: s.notes,
+			handler: s.authenticate(s.notes),
 		},
 		{
 			path:    fmt.Sprintf("edit/%s%s", wildcard, wildcard),
-			handler: s.edit,
+			handler: s.authenticate(s.edit),
 		},
 		{
 			path:    fmt.Sprintf("submit/%s%s", wildcard, wildcard),
-			handler: s.submit,
+			handler: s.authenticate(s.submit),
 		},
 		{
 			path:    fmt.Sprintf("create/%s%s", wildcard, wildcard),
-			handler: s.create,
+			handler: s.authenticate(s.create),
 		},
 	}

@@ -37,3 +40,16 @@ func (s *Server) Routes() error {
 	}
 	return nil
 }
+
+func (s *Server) authenticate(foo http.HandlerFunc) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		if config.OAuthServer != "" {
+			err := oauth2client.Authenticate(config.OAuthServer, w, r)
+			if err != nil {
+				log.Println(err)
+				return
+			}
+		}
+		foo(w, r)
+	}
+}
--- a/wrapper.html
+++ b/wrapper.html
@@ -12,6 +12,9 @@
            padding: .5pt;
            border-radius: 6px;
         }
+         img {
+            max-height: 400px;
+         }
      </style>
   </header>
   <body height="100%">
Author	SHA1	Message	Date
bel	c6d43699ef	TODO	2019-11-06 17:19:57 -07:00
Bel LaPointe	618b9ed513	Fix serving . but absolute and parents still cause bugs	2019-10-21 09:52:05 -06:00
bel	0595c49fc2	todo	2019-10-20 17:34:02 -06:00
bel	da6eaca26f	Pass things around via query params	2019-10-20 16:39:26 -06:00
bel	fb02cc994a	Dockerfile	2019-10-20 02:27:28 +00:00
bel	a80f9613ef	Prove dropdown and image max	2019-10-20 02:16:41 +00:00