TODO

TODO

@@ -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)

config/config.go

@@ -11,10 +11,11 @@ import (
 )
 
 var (
-	Root string
-	Port string
-	Head string
-	Foot string
+	Root        string
+	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()
 }

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)

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)
+	}
+}