diff --git a/VERSION b/VERSION index f0bb29e..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0 +1.1.0 diff --git a/src/cmd/coller/main.go b/src/cmd/coller/main.go index e213740..bb820d2 100644 --- a/src/cmd/coller/main.go +++ b/src/cmd/coller/main.go @@ -61,7 +61,6 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") - jsonFormat := flag.Bool("json", false, "Print logs in JSON format") configFile := flag.String("config", filepath.Join(homeDir, ".config", AppName+".json"), "Configuration file") reconfigure := flag.Bool("reconfigure", false, "Re-create configuration file") url := flag.String("url", "", "URL of the coller API") @@ -103,13 +102,7 @@ func handleMain() int { if *quiet { level = slog.LevelError } - - var logger *slog.Logger - if *jsonFormat { - logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } else { - logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } + logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) if *url == "" { if _, err = os.Stat(*configFile); errors.Is(err, os.ErrNotExist) || *reconfigure { diff --git a/src/cmd/collerd/README.md b/src/cmd/collerd/README.md index a8936e4..9c0aae1 100644 --- a/src/cmd/collerd/README.md +++ b/src/cmd/collerd/README.md @@ -41,11 +41,9 @@ The file format is **JSON**: * **tls_key_file** (string): Path to TLS key file to enable HTTPS * **ace_directory** (string): Serve [Ace](hhttps://ace.c9.io/) assets from this local directory (ex: "./node_modules/ace-builds"). See **Dependencies** for details. * **bootstrap_directory** (string): Serve [Bootstrap](https://getbootstrap.com/) assets from this local directory (ex: "./node_modules/bootstrap/dist"). See **Dependencies** for details. -* **clients_base_directory** (string): Serve clients binaries from this local base directory (ex: "./releases"). The version will be append to the directory. Ignored if `show_version` is disabled. -* **clients_base_url** (string): Define the base URL to download clients (default "https://git.riou.xyz/jriou/coller/releases/download"). The version (or "latest") will be append. * **disable_editor** (bool): Disable Ace editor. -The configuration file is optional. +The configuration file is not required but the service might not be exposed to the public. ## API diff --git a/src/cmd/collerd/main.go b/src/cmd/collerd/main.go index 2837dd4..265fe73 100644 --- a/src/cmd/collerd/main.go +++ b/src/cmd/collerd/main.go @@ -27,7 +27,6 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") - jsonFormat := flag.Bool("json", false, "Print logs in JSON format") configFileName := flag.String("config", "", "Configuration file name") flag.Parse() @@ -47,13 +46,7 @@ func handleMain() int { if *quiet { level = slog.LevelError } - - var logger *slog.Logger - if *jsonFormat { - logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } else { - logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } + logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) if *configFileName != "" { err = internal.ReadConfig(*configFileName, config) diff --git a/src/cmd/copier/main.go b/src/cmd/copier/main.go index fc59e23..17dd9e5 100644 --- a/src/cmd/copier/main.go +++ b/src/cmd/copier/main.go @@ -41,7 +41,6 @@ func handleMain() int { quiet := flag.Bool("quiet", false, "Log errors only") verbose := flag.Bool("verbose", false, "Print more logs") debug := flag.Bool("debug", false, "Print even more logs") - jsonFormat := flag.Bool("json", false, "Print logs in JSON format") encryptionKey := flag.String("encryption-key", os.Getenv("COLLER_ENCRYPTION_KEY"), "Key to decrypt the note") askEncryptionKey := flag.Bool("ask-encryption-key", false, "Read encryption key from input") fileName := flag.String("file", "", "Write content of the note to a file") @@ -73,13 +72,7 @@ func handleMain() int { if *quiet { level = slog.LevelError } - - var logger *slog.Logger - if *jsonFormat { - logger = slog.New(slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } else { - logger = slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) - } + logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level})) if *askEncryptionKey { fmt.Print("Encryption key: ") @@ -119,7 +112,7 @@ func handleMain() int { var req *http.Request if *password != "" { body := &NotePayload{ - Password: internal.Encode([]byte(*password)), + Password: *password, } payload, err := json.Marshal(body) if err != nil { diff --git a/src/server/config.go b/src/server/config.go index 9e41bd8..bb27bd2 100644 --- a/src/server/config.go +++ b/src/server/config.go @@ -34,8 +34,6 @@ type Config struct { AceDirectory string `json:"ace_directory"` BootstrapDirectory string `json:"bootstrap_directory"` DisableEditor bool `json:"disable_editor"` - ClientsBaseURL string `json:"clients_base_url"` - ClientsBaseDirectory string `json:"clients_base_directory"` } func NewConfig() *Config { @@ -82,7 +80,6 @@ func NewConfig() *Config { Language: "text", EnableUploadFileButton: true, EnablePasswordProtection: true, - ClientsBaseURL: "https://git.riou.xyz/jriou/coller/releases/download", } } diff --git a/src/server/handlers_api.go b/src/server/handlers_api.go index 56b2451..d41a254 100644 --- a/src/server/handlers_api.go +++ b/src/server/handlers_api.go @@ -213,14 +213,8 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } } - password, err := internal.Decode(body.Password) - if err != nil { - APIError(w, logger, ErrCouldNotDecodePassword, err) - return - } - if len(note.PasswordHash) > 0 { - err := bcrypt.CompareHashAndPassword(note.PasswordHash, password) + err := bcrypt.CompareHashAndPassword(note.PasswordHash, []byte(body.Password)) if err != nil { APIErrorBadRequest(w, logger, ErrInvalidPassword, err) return @@ -232,10 +226,8 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque } type ClientHandler struct { - logger *slog.Logger - version string - baseURL string - baseDirectory string + logger *slog.Logger + version string } func (h *ClientHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { @@ -250,19 +242,10 @@ func (h *ClientHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { return } - // No disclosure of the version running on the server - if h.version == "" { - http.Redirect(w, r, fmt.Sprintf("%s/%s/%s-%s-%s", h.baseURL, "latest", clientName, os, arch), http.StatusMovedPermanently) - return + version := h.version + if version == "" { + version = "latest" } - if h.baseDirectory != "" { - // Serve file locally - // Example: ./releases/1.2.0/coller-linux-amd64 - http.ServeFile(w, r, fmt.Sprintf("%s/%s/%s-%s-%s", h.baseDirectory, h.version, clientName, os, arch)) - } else { - // Redirect to a download link - // Example: https://git.riou.xyz/jriou/coller/releases/download/1.2.0/coller-linux-amd64 - http.Redirect(w, r, fmt.Sprintf("%s/%s/%s-%s-%s", h.baseURL, h.version, clientName, os, arch), http.StatusMovedPermanently) - } + http.Redirect(w, r, fmt.Sprintf("https://git.riou.xyz/jriou/%s/releases/download/%s/%s-%s-%s", clientName, version, clientName, os, arch), http.StatusMovedPermanently) } diff --git a/src/server/handlers_web.go b/src/server/handlers_web.go index c1a38ac..ba39258 100644 --- a/src/server/handlers_web.go +++ b/src/server/handlers_web.go @@ -34,7 +34,6 @@ type PageData struct { AceDirectory string BootstrapDirectory string DisableEditor bool - Password string // Not stored in the database } func WebError(w http.ResponseWriter, pageData PageData, templates *template.Template, templateName string, logger *slog.Logger, topLevelErr error, err error) { @@ -440,7 +439,6 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re } } - h.PageData.Password = password h.PageData.Note = note logger.Debug("rendering page") diff --git a/src/server/server.go b/src/server/server.go index 77950a1..df86710 100644 --- a/src/server/server.go +++ b/src/server/server.go @@ -133,10 +133,8 @@ func (s *Server) Start() error { r.Path("/clients.html").Handler(clientsHandler).Methods("GET") clientHandler := &ClientHandler{ - logger: s.logger, - version: p.Version, - baseURL: s.config.ClientsBaseURL, - baseDirectory: s.config.ClientsBaseDirectory, + logger: s.logger, + version: p.Version, } r.Path("/clients/{os:[a-z]+}-{arch:[a-z0-9]+}/{clientName:[a-z]+}").Handler(clientHandler).Methods("GET") @@ -179,9 +177,7 @@ func (s *Server) Start() error { } if s.config.BootstrapDirectory != "" { - r.HandleFunc("/static/bootstrap/css/bootstrap.min.css", func(w http.ResponseWriter, r *http.Request) { - http.ServeFile(w, r, s.config.BootstrapDirectory+"/css/bootstrap.min.css") - }) + r.PathPrefix("/static/bootstrap/").Handler(http.StripPrefix("/static/bootstrap/", http.FileServer(http.Dir(s.config.BootstrapDirectory)))) } r.Path("/").Handler(&HomeHandler{Templates: templates, PageData: p}).Methods("GET") diff --git a/src/server/templates/note.html b/src/server/templates/note.html index 03aca94..7972a3e 100644 --- a/src/server/templates/note.html +++ b/src/server/templates/note.html @@ -6,12 +6,6 @@
Note {{.Note.ID}}
- - - - - {{if .DisableEditor}} 
@@ -93,8 +28,7 @@
{{else}}
-
+