feat: disable editor

Signed-off-by: Julien Riou <julien@riou.xyz>
style: Simplify condition to load bootstrap
2025-09-24 07:10:59 +02:00 · 2025-09-24 07:10:57 +02:00 · 2025-09-24 07:10:52 +02:00 · 2025-09-24 07:09:01 +02:00
20 changed files with 232 additions and 190 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -5,6 +5,7 @@
  "packages": {
    "": {
      "dependencies": {
+        "ace-builds": "^1.43.3",
        "bootstrap": "^5.3.8"
      }
    },
@ -18,6 +19,11 @@
        "url": "https://opencollective.com/popperjs"
      }
    },
+    "node_modules/ace-builds": {
+      "version": "1.43.3",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.43.3.tgz",
+      "integrity": "sha512-MCl9rALmXwIty/4Qboijo/yNysx1r6hBTzG+6n/TiOm5LFhZpEvEIcIITPFiEOEFDfgBOEmxu+a4f54LEFM6Sg=="
+    },
    "node_modules/bootstrap": {
      "version": "5.3.8",
      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
--- a/package.json
+++ b/package.json
@ -1,5 +1,6 @@
 {
  "dependencies": {
+    "ace-builds": "^1.43.3",
    "bootstrap": "^5.3.8"
  }
 }
--- a/src/cmd/coller/README.md
+++ b/src/cmd/coller/README.md
@ -22,17 +22,17 @@ Create from file:
 coller -file filename.txt
 ```

-Provide password for encryption:
+Provide encryption key:

 ```
-coller -ask-password
-coller -password PASSWORD
+coller -ask-encryption-key
+coller -encryption-key ENCRYPTION_KEY
 ```

-Create public note:
+Create a note in cleartext:

 ```
-coller -no-password
+coller -no-encryption
 ```

 Return the copier command to use client-side decryption instead of the URL:
--- a/src/cmd/coller/main.go
+++ b/src/cmd/coller/main.go
@ -64,10 +64,10 @@ func handleMain() int {
 	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")
-	password := flag.String("password", os.Getenv("COLLER_PASSWORD"), "Password to encrypt the note")
-	askPassword := flag.Bool("ask-password", false, "Read password from input")
-	noPassword := flag.Bool("no-password", false, "Allow notes without password")
-	passwordLength := flag.Int("password-length", 16, "Length of the auto-generated password")
+	encryptionKey := flag.String("encryption-key", os.Getenv("COLLER_ENCRYPTION_KEY"), "Key to encrypt the note")
+	askEncryptionKey := flag.Bool("ask-encryption-key", false, "Read encryption key from input")
+	noEncryption := flag.Bool("no-encryption", false, "Allow notes without encryption key")
+	encryptionKeyLength := flag.Int("encryption-key-length", 16, "Length of the auto-generated encryption key")
 	flag.StringVar(&fileName, "file", "", "Read content of the note from a file")
 	expiration := flag.Int("expiration", 0, "Number of seconds before expiration")
 	deleteAfterRead := flag.Bool("delete-after-read", false, "Delete the note after the first read")
@ -140,22 +140,22 @@ func handleMain() int {
 		content = clipboard.Read(clipboard.FmtText)
 	}

-	if *askPassword {
-		fmt.Print("Password: ")
+	if *askEncryptionKey {
+		fmt.Print("Encryption key: ")
 		p, err := term.ReadPassword(int(syscall.Stdin))
 		if err != nil {
-			return internal.ReturnError(logger, "could not read password", err)
+			return internal.ReturnError(logger, "could not read encryption key", err)
 		}
-		*password = string(p)
+		*encryptionKey = string(p)
 		fmt.Print("\n")
 	}

-	if !*noPassword && *password == "" {
-		logger.Debug("generating random password")
-		if *passwordLength < internal.MIN_PASSWORD_LENGTH || *passwordLength > internal.MAX_PASSWORD_LENGTH {
-			return internal.ReturnError(logger, "invalid password length for auto-generated password", fmt.Errorf("password length must be between %d and %d", internal.MIN_PASSWORD_LENGTH, internal.MAX_PASSWORD_LENGTH))
+	if !*noEncryption && *encryptionKey == "" {
+		logger.Debug("generating random encryption key")
+		if *encryptionKeyLength < internal.MIN_ENCRYPTION_KEY_LENGTH || *encryptionKeyLength > internal.MAX_ENCRYPTION_KEY_LENGTH {
+			return internal.ReturnError(logger, "invalid length of auto-generated encryption key", fmt.Errorf("encryption key length must be between %d and %d", internal.MIN_ENCRYPTION_KEY_LENGTH, internal.MAX_ENCRYPTION_KEY_LENGTH))
 		}
-		*password = internal.GenerateChars(*passwordLength)
+		*encryptionKey = internal.GenerateChars(*encryptionKeyLength)
 	}

 	if len(content) == 0 {
@ -173,13 +173,13 @@ func handleMain() int {
 		p.Language = *language
 	}

-	if *password != "" {
-		logger.Debug("validating password")
-		if err = internal.ValidatePassword(*password); err != nil {
-			return internal.ReturnError(logger, "invalid password", nil)
+	if *encryptionKey != "" {
+		logger.Debug("validating encryption key")
+		if err = internal.ValidateEncryptionKey(*encryptionKey); err != nil {
+			return internal.ReturnError(logger, "invalid encryption key", nil)
 		}
 		logger.Debug("encrypting content")
-		content, err = internal.Encrypt(content, *password)
+		content, err = internal.Encrypt(content, *encryptionKey)
 		if err != nil {
 			return internal.ReturnError(logger, "could not encrypt note", err)
 		}
@ -242,21 +242,21 @@ func handleMain() int {
 	logger.Debug("finding note location")
 	var location string
 	noteURL := *url + "/" + jsonBody.ID
-	if *password != "" {
+	if *encryptionKey != "" {
 		if *copier {
-			location = fmt.Sprintf("copier -password %s %s", *password, noteURL)
+			location = fmt.Sprintf("copier -encryption-key %s %s", *encryptionKey, noteURL)
 		} else {
 			if *html {
-				location = fmt.Sprintf("%s/%s.html", noteURL, *password)
+				location = fmt.Sprintf("%s/%s.html", noteURL, *encryptionKey)
 			} else {
-				location = fmt.Sprintf("%s/%s", noteURL, *password)
+				location = fmt.Sprintf("%s/%s", noteURL, *encryptionKey)
 			}
 		}
 	} else {
 		if *html {
 			location = fmt.Sprintf("%s.html", noteURL)
 		} else {
-			location = fmt.Sprintf("%s", noteURL)
+			location = noteURL
 		}
 	}

--- a/src/cmd/collerd/README.md
+++ b/src/cmd/collerd/README.md
@ -19,7 +19,7 @@ The file format is **JSON**:
 * **database_type** (string): Type of the database (default "sqlite", "postgres" also supported)
 * **database_dsn** (string): Connection string for the database (default "collerd.db")
 * **node_id** (int): Number between 0 and 1023 to define the node generating identifiers (see [snowflake](https://github.com/bwmarrin/snowflake))
-* **password_length** (int): Number of characters for generated passwords (default 16)
+* **encryption_key_length** (int): Number of characters for generated encryption key (default 16)
 * **expiration_interval** (int): Number of seconds to wait between two expiration runs
 * **listen_address** (string): Address to listen for the web server (default "0.0.0.0")
 * **listen_port** (int): Port to listen for the web server (default 8080)
@ -31,12 +31,14 @@ The file format is **JSON**:
 * **prometheus_route** (string): Route to expose Prometheus metrics (default "/metrics")
 * **prometheus_notes_metric** (string): Name of the notes count metric (default "collerd_notes")
 * **observation_internal** (int): Number of seconds to wait between two observations (default 60)
-* **languages** ([]string): List of supported [languages](https://github.com/microsoft/monaco-editor/tree/main/src/basic-languages)
+* **languages** ([]string): List of supported [languages](https://github.com/ajaxorg/ace/tree/master/src/mode)
 * **language** (string): Default language (default "text")
 * **enable_upload_file_button** (bool): Display the upload file button in the UI (default true)
 * **tls_cert_file** (string): Path to TLS certificate file to enable HTTPS
 * **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.
+* **disable_editor** (bool): Disable Ace editor.

 The configuration file is not required but the service might not be exposed to the public.

@ -52,7 +54,7 @@ Create a note.

 Body (JSON):
 * **content** (string): base64 encoded content (required)
-* **password** (string): use server-side encryption with this password
+* **encryption_key** (string): use server-side encryption with this encryption key
 * **encrypted** (bool): true if the content has been encrypted by the client
 * **expiration** (int): lifetime of the note in seconds (must be supported by the server)
 * **delete_after_read** (bool): delete the note after the first read
@ -62,12 +64,12 @@ Response (JSON):
 * **id** (string): ID of the note


-### GET /\<id\>/\<password\>
+### GET /\<id\>/\<encryptionKey\>

 > [!WARNING]
-> Potential password leak
+> Potential encryption key leak

-Return content of a note encrypted by the given password.
+Return content of a note encrypted by the given encryption key.

 ### GET /\<id\>

@ -85,12 +87,12 @@ Errors return **500 Server Internal Error** with the **JSON** payload:

 The web interface depends on:

+- [Ace](https://ace.c9.io/)
 - [Bootstrap](https://getbootstrap.com/)
- [Monaco Editor](https://github.com/microsoft/monaco-editor/)

 By default, those dependencies are fetched from **remote CDN** services by the client.

-If you would like to download them to serve them locally:
+If you would like to download and serve them locally:

 ```
 npm install
@ -106,8 +108,7 @@ Then configure the local directories:

 ```json
 {
+  "ace_directory": "./node_modules/ace-builds",
  "bootstrap_directory": "./node_modules/bootstrap/dist"
 }
-```
-
-Downloading Monaco Editor is not supported yet.
+```
--- a/src/cmd/collerd/main.go
+++ b/src/cmd/collerd/main.go
@ -70,7 +70,7 @@ func handleMain() int {
 		return internal.ReturnError(logger, "could not create server", err)
 	}

-	srv.SetPasswordLength(config.PasswordLength)
+	srv.SetEncryptionKeyLength(config.EncryptionKeyLength)

 	if config.EnableMetrics {
 		reg := prometheus.NewRegistry()
--- a/src/cmd/copier/README.md
+++ b/src/cmd/copier/README.md
@ -11,6 +11,6 @@ copier -help
 # Examples

 ```
-copier -password PASSWORD URL
-copier -ask-password URL
+copier -encryption-key ENCRYPTION_KEY URL
+copier -ask-encryption-key URL
 ```
--- a/src/cmd/copier/main.go
+++ b/src/cmd/copier/main.go
@ -9,8 +9,9 @@ import (
 	"os"
 	"syscall"

-	"git.riou.xyz/jriou/coller/internal"
 	"golang.org/x/term"
+
+	"git.riou.xyz/jriou/coller/internal"
 )

 var (
@ -28,8 +29,8 @@ 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")
-	password := flag.String("password", os.Getenv("COLLER_PASSWORD"), "Password to decrypt the note")
-	askPassword := flag.Bool("ask-password", false, "Read password from input")
+	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")
 	bearer := flag.String("bearer", os.Getenv("COLLER_BEARER"), "Bearer token")
 	askBearer := flag.Bool("ask-bearer", false, "Read bearer token from input")
@ -60,13 +61,13 @@ func handleMain() int {
 	}
 	logger := slog.New(slog.NewTextHandler(os.Stdout, &slog.HandlerOptions{Level: level}))

-	if *askPassword {
-		fmt.Print("Password: ")
+	if *askEncryptionKey {
+		fmt.Print("Encryption key: ")
 		p, err := term.ReadPassword(int(syscall.Stdin))
 		if err != nil {
-			return internal.ReturnError(logger, "could not read password", err)
+			return internal.ReturnError(logger, "could not read encryption key", err)
 		}
-		*password = string(p)
+		*encryptionKey = string(p)
 		fmt.Print("\n")
 	}

@ -102,11 +103,11 @@ func handleMain() int {
 	}

 	var content []byte
-	if *password != "" {
+	if *encryptionKey != "" {
 		logger.Debug("decrypting note")
-		content, err = internal.Decrypt(body, *password)
+		content, err = internal.Decrypt(body, *encryptionKey)
 		if err != nil {
-			return internal.ReturnError(logger, "could not decrypt paste", err)
+			return internal.ReturnError(logger, "could not decrypt note", err)
 		}
 	} else {
 		content = body
--- a/src/internal/encryption.go
+++ b/src/internal/encryption.go
@ -19,21 +19,21 @@ const (

 // NewCipher creates a cipher using XChaCha20-Poly1305
 // https://pkg.go.dev/golang.org/x/crypto/chacha20poly1305
-// A salt is required to derive the key from a password using argon
-func NewCipher(password string, salt []byte) (cipher.AEAD, error) {
-	key := argon2.IDKey([]byte(password), salt, KeyTime, KeyMemory, KeyThreads, KeySize)
+// A salt is required to derive the key from an encryption key using argon
+func NewCipher(encryptionKey string, salt []byte) (cipher.AEAD, error) {
+	key := argon2.IDKey([]byte(encryptionKey), salt, KeyTime, KeyMemory, KeyThreads, KeySize)
 	return chacha20poly1305.NewX(key)
 }

-// Encrypt to encrypt a plaintext with a password
+// Encrypt to encrypt a plaintext with an encryption key
 // Returns a byte slice with the generated salt, nonce and the ciphertext
-func Encrypt(plaintext []byte, password string) (result []byte, err error) {
+func Encrypt(plaintext []byte, encryptionKey string) (result []byte, err error) {
 	salt := make([]byte, SaltSize)
 	if n, err := rand.Read(salt); err != nil || n != SaltSize {
 		return nil, err
 	}

-	aead, err := NewCipher(password, salt)
+	aead, err := NewCipher(encryptionKey, salt)
 	if err != nil {
 		return nil, err
 	}
@ -53,15 +53,15 @@ func Encrypt(plaintext []byte, password string) (result []byte, err error) {
 	return result, nil
 }

-// Decrypt to decrypt a ciphertext with a password
+// Decrypt to decrypt a ciphertext with a encryption key
 // Returns the plaintext
-func Decrypt(ciphertext []byte, password string) ([]byte, error) {
+func Decrypt(ciphertext []byte, encryptionKey string) ([]byte, error) {
 	if len(ciphertext) < SaltSize {
 		return nil, fmt.Errorf("ciphertext is too short: cannot read salt")
 	}
 	salt := ciphertext[:SaltSize]

-	aead, err := NewCipher(password, salt)
+	aead, err := NewCipher(encryptionKey, salt)
 	if err != nil {
 		return nil, err
 	}
--- a/src/internal/encryption_test.go
+++ b/src/internal/encryption_test.go
@ -6,10 +6,10 @@ import (

 func TestEncryptAndDecrypt(t *testing.T) {
 	plaintext := "test"
-	password := "test"
-	wrongPassword := password + "wrong"
+	encryptionKey := "test"
+	wrongEncryptionKey := encryptionKey + "wrong"

-	ciphertext, err := Encrypt([]byte(plaintext), password)
+	ciphertext, err := Encrypt([]byte(plaintext), encryptionKey)
 	if err != nil {
 		t.Errorf("unexpected error when encrypting: %v", err)
 		return
@ -20,7 +20,7 @@ func TestEncryptAndDecrypt(t *testing.T) {
 		return
 	}

-	cleartext, err := Decrypt(ciphertext, password)
+	cleartext, err := Decrypt(ciphertext, encryptionKey)
 	if err != nil {
 		t.Errorf("unexpected error when decrypting: %v", err)
 		return
@ -31,14 +31,14 @@ func TestEncryptAndDecrypt(t *testing.T) {
 		return
 	}

-	if password == wrongPassword {
-		t.Errorf("passwords must be different")
+	if encryptionKey == wrongEncryptionKey {
+		t.Errorf("encryption keys must be different")
 		return
 	}

-	_, err = Decrypt(ciphertext, wrongPassword)
+	_, err = Decrypt(ciphertext, wrongEncryptionKey)
 	if err == nil {
-		t.Errorf("expected error when decrypting with a wrong password, got none")
+		t.Errorf("expected error when decrypting with a wrong encryption key, got none")
 		return
 	}
 }
--- a/src/internal/internal.go
+++ b/src/internal/internal.go
@ -1,8 +1,8 @@
 package internal

 const (
-	RC_OK               = 0
-	RC_ERROR            = 1
-	MIN_PASSWORD_LENGTH = 16
-	MAX_PASSWORD_LENGTH = 256
+	RC_OK                     = 0
+	RC_ERROR                  = 1
+	MIN_ENCRYPTION_KEY_LENGTH = 16
+	MAX_ENCRYPTION_KEY_LENGTH = 256
 )
--- a/src/internal/utils.go
+++ b/src/internal/utils.go
@ -58,13 +58,13 @@ func GenerateChars(n int) string {
 	return string(b)
 }

-// Passwords must be URL compatible and strong enough
+// Encryption key must be URL compatible and strong enough
 // Requiring only alphanumeric chars with a size between 16 and 256
-var passwordRegexp = regexp.MustCompile("^[a-zA-Z0-9]{16,256}$")
+var encryptionKeyRegexp = regexp.MustCompile("^[a-zA-Z0-9]{16,256}$")

-func ValidatePassword(p string) error {
-	if !passwordRegexp.MatchString(p) {
-		return fmt.Errorf("password doesn't match '%s'", passwordRegexp)
+func ValidateEncryptionKey(p string) error {
+	if !encryptionKeyRegexp.MatchString(p) {
+		return fmt.Errorf("encryption key doesn't match '%s'", encryptionKeyRegexp)
 	}
 	return nil
 }
--- a/src/server/config.go
+++ b/src/server/config.go
@ -11,7 +11,7 @@ type Config struct {
 	DatabaseType           string   `json:"database_type"`
 	DatabaseDsn            string   `json:"database_dsn"`
 	NodeID                 int64    `json:"node_id"`
-	PasswordLength         int      `json:"password_length"`
+	EncryptionKeyLength    int      `json:"encryption_key_length"`
 	ExpirationInterval     int      `json:"expiration_interval"`
 	ListenAddress          string   `json:"listen_address"`
 	ListenPort             int      `json:"listen_port"`
@ -28,19 +28,21 @@ type Config struct {
 	EnableUploadFileButton bool     `json:"enable_upload_file_button"`
 	TLSCertFile            string   `json:"tls_cert_file"`
 	TLSKeyFile             string   `json:"tls_key_file"`
+	AceDirectory           string   `json:"ace_directory"`
 	BootstrapDirectory     string   `json:"bootstrap_directory"`
+	DisableEditor          bool     `json:"disable_editor"`
 }

 func NewConfig() *Config {
 	return &Config{
-		Title:              "Coller",
-		DatabaseType:       "sqlite",
-		DatabaseDsn:        "collerd.db",
-		NodeID:             1,
-		PasswordLength:     16,
-		ExpirationInterval: 60, // 1 minute
-		ListenAddress:      "0.0.0.0",
-		ListenPort:         8080,
+		Title:               "Coller",
+		DatabaseType:        "sqlite",
+		DatabaseDsn:         "collerd.db",
+		NodeID:              1,
+		EncryptionKeyLength: 16,
+		ExpirationInterval:  60, // 1 minute
+		ListenAddress:       "0.0.0.0",
+		ListenPort:          8080,
 		Expirations: []int{
 			300,      // 5 minutes
 			3600,     // 1 hour
@ -56,22 +58,21 @@ func NewConfig() *Config {
 		PrometheusNotesMetric: "collerd_notes",
 		ObservationInterval:   60,
 		Languages: []string{
-			"Text",
-			"CSS",
-			"Dockerfile",
-			"Go",
-			"HCL",
-			"HTML",
-			"Javascript",
-			"JSON",
-			"Markdown",
-			"Perl",
-			"Python",
-			"Ruby",
-			"Rust",
-			"Shell",
-			"SQL",
-			"YAML",
+			"css",
+			"dockerfile",
+			"golang",
+			"html",
+			"javascript",
+			"json",
+			"markdown",
+			"perl",
+			"python",
+			"ruby",
+			"rust",
+			"sh",
+			"sql",
+			"text",
+			"yaml",
 		},
 		Language:               "text",
 		EnableUploadFileButton: true,
@ -92,8 +93,8 @@ func (c *Config) Check() error {
 		return fmt.Errorf("node id must be between 0 and 1023")
 	}

-	if c.PasswordLength < internal.MIN_PASSWORD_LENGTH || c.PasswordLength > internal.MAX_PASSWORD_LENGTH {
-		return fmt.Errorf("password length must be between %d and %d", internal.MIN_PASSWORD_LENGTH, internal.MAX_PASSWORD_LENGTH)
+	if c.EncryptionKeyLength < internal.MIN_ENCRYPTION_KEY_LENGTH || c.EncryptionKeyLength > internal.MAX_ENCRYPTION_KEY_LENGTH {
+		return fmt.Errorf("encryption key length must be between %d and %d", internal.MIN_ENCRYPTION_KEY_LENGTH, internal.MAX_ENCRYPTION_KEY_LENGTH)
 	}
 	return nil
 }
--- a/src/server/db.go
+++ b/src/server/db.go
@ -122,7 +122,7 @@ func (d *Database) Get(id string) (*Note, error) {
 	return nil, nil
 }

-func (d *Database) Create(content []byte, password string, encrypted bool, expiration int, deleteAfterRead bool, language string) (note *Note, err error) {
+func (d *Database) Create(content []byte, encryptionKey string, encrypted bool, expiration int, deleteAfterRead bool, language string) (note *Note, err error) {
 	if expiration == 0 {
 		expiration = d.expiration
 	}
@ -148,11 +148,11 @@ func (d *Database) Create(content []byte, password string, encrypted bool, expir
 		DeleteAfterRead: deleteAfterRead,
 		Language:        language,
 	}
-	if password != "" {
-		if err = internal.ValidatePassword(password); err != nil {
+	if encryptionKey != "" {
+		if err = internal.ValidateEncryptionKey(encryptionKey); err != nil {
 			return nil, err
 		}
-		note.Content, err = internal.Encrypt(note.Content, password)
+		note.Content, err = internal.Encrypt(note.Content, encryptionKey)
 		if err != nil {
 			return nil, err
 		}
--- a/src/server/handlers_api.go
+++ b/src/server/handlers_api.go
@ -23,7 +23,7 @@ type CreateNoteHandler struct {

 type CreateNotePayload struct {
 	Content         string `json:"content"`
-	Password        string `json:"password"`
+	EncryptionKey   string `json:"encryption_key"`
 	Encrypted       bool   `json:"encrypted"`
 	Expiration      int    `json:"expiration"`
 	DeleteAfterRead bool   `json:"delete_after_read"`
@ -54,7 +54,7 @@ func (h *CreateNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}

-	note, err := h.db.Create(content, body.Password, body.Encrypted, body.Expiration, body.DeleteAfterRead, body.Language)
+	note, err := h.db.Create(content, body.EncryptionKey, body.Encrypted, body.Expiration, body.DeleteAfterRead, body.Language)
 	if err != nil {
 		WriteError(w, "could not create note", err)
 		return
@ -99,7 +99,7 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque

 	vars := mux.Vars(r)
 	id := vars["id"]
-	password := vars["password"]
+	encryptionKey := vars["encryptionKey"]

 	note, err := h.db.Get(id)

@ -111,8 +111,8 @@ func (h *GetProtectedNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		return
 	}

-	if password != "" && note.Encrypted {
-		note.Content, err = internal.Decrypt(note.Content, password)
+	if encryptionKey != "" && note.Encrypted {
+		note.Content, err = internal.Decrypt(note.Content, encryptionKey)
 		if err != nil {
 			WriteError(w, "could not decrypt note", err)
 			return
--- a/src/server/handlers_web.go
+++ b/src/server/handlers_web.go
@ -21,12 +21,15 @@ type PageData struct {
 	Version                string
 	Expirations            []int
 	Expiration             int
+	Language               string
 	Languages              []string
 	Err                    error
 	URL                    string
 	Note                   *Note
 	EnableUploadFileButton bool
+	AceDirectory           string
 	BootstrapDirectory     string
+	DisableEditor          bool
 }

 type HomeHandler struct {
@ -109,15 +112,15 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	}

 	h.logger.Debug("checking inputs")
-	noPassword := r.FormValue("no-password")
-	password := r.FormValue("password")
+	noEncryption := r.FormValue("no-encryption")
+	encryptionKey := r.FormValue("encryption-key")
 	expiration := r.FormValue("expiration")
 	deleteAfterRead := r.FormValue("delete-after-read")
 	language := r.FormValue("language")

-	if password == "" && noPassword == "" {
-		h.logger.Debug("generating password")
-		password = internal.GenerateChars(passwordLength)
+	if encryptionKey == "" && noEncryption == "" {
+		h.logger.Debug("generating encryption key")
+		encryptionKey = internal.GenerateChars(encryptionKeyLength)
 	}

 	h.logger.Debug("computing expiration")
@ -129,7 +132,7 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	}

 	h.logger.Debug("saving note to the database")
-	note, err := h.db.Create(content, password, password != "", expirationInt, deleteAfterRead != "", language)
+	note, err := h.db.Create(content, encryptionKey, encryptionKey != "", expirationInt, deleteAfterRead != "", language)
 	if err != nil {
 		h.PageData.Err = err
 		h.Templates.ExecuteTemplate(w, templateName, h.PageData)
@ -143,8 +146,8 @@ func (h *CreateNoteWithFormHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 	}

 	h.PageData.URL = fmt.Sprintf("%s%s/%s", scheme, r.Host, note.ID)
-	if password != "" {
-		h.PageData.URL += "/" + password
+	if encryptionKey != "" {
+		h.PageData.URL += "/" + encryptionKey
 	}

 	h.logger.Debug("rendering page")
@ -197,7 +200,7 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re

 	vars := mux.Vars(r)
 	id := vars["id"]
-	password := vars["password"]
+	encryptionKey := vars["encryptionKey"]

 	note, err := h.db.Get(id)

@ -213,8 +216,8 @@ func (h *GetProtectedWebNoteHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
 		return
 	}

-	if password != "" && note.Encrypted {
-		note.Content, err = internal.Decrypt(note.Content, password)
+	if encryptionKey != "" && note.Encrypted {
+		note.Content, err = internal.Decrypt(note.Content, encryptionKey)
 		if err != nil {
 			h.PageData.Err = fmt.Errorf("could not decrypt note: %v", err)
 			h.Templates.ExecuteTemplate(w, templateName, h.PageData)
--- a/src/server/server.go
+++ b/src/server/server.go
@ -16,10 +16,10 @@ import (
 )

 var (
-	passwordLength   = internal.MIN_PASSWORD_LENGTH
-	supportedOSes    = []string{"linux", "darwin"}
-	supportedArches  = []string{"amd64", "arm64"}
-	supportedClients = []string{"coller", "copier"}
+	encryptionKeyLength = internal.MIN_ENCRYPTION_KEY_LENGTH
+	supportedOSes       = []string{"linux", "darwin"}
+	supportedArches     = []string{"amd64", "arm64"}
+	supportedClients    = []string{"coller", "copier"}
 )

 type Server struct {
@ -41,8 +41,8 @@ func NewServer(logger *slog.Logger, db *Database, config *Config, version string
 	}, nil
 }

-func (s *Server) SetPasswordLength(length int) {
-	passwordLength = length
+func (s *Server) SetEncryptionKeyLength(length int) {
+	encryptionKeyLength = length
 }

 func (s *Server) SetMetrics(metrics *Metrics) {
@ -100,7 +100,7 @@ func (s *Server) Start() error {

 	// API
 	r.Path("/api/note").Handler(&CreateNoteHandler{logger: s.logger, db: s.db, maxUploadSize: s.config.MaxUploadSize}).Methods("POST")
-	r.Path("/{id:[a-zA-Z0-9]+}/{password:[a-zA-Z0-9]+}").Handler(&GetProtectedNoteHandler{logger: s.logger, db: s.db}).Methods("GET")
+	r.Path("/{id:[a-zA-Z0-9]+}/{encryptionKey:[a-zA-Z0-9]+}").Handler(&GetProtectedNoteHandler{logger: s.logger, db: s.db}).Methods("GET")
 	r.Path("/{id:[a-zA-Z0-9]+}").Handler(&GetNoteHandler{logger: s.logger, db: s.db}).Methods("GET")

 	// Web pages
@ -114,8 +114,11 @@ func (s *Server) Start() error {
 		Title:              s.config.Title,
 		Expirations:        s.config.Expirations,
 		Expiration:         s.config.Expiration,
+		Language:           s.config.Language,
 		Languages:          s.config.Languages,
+		AceDirectory:       s.config.AceDirectory,
 		BootstrapDirectory: s.config.BootstrapDirectory,
+		DisableEditor:      s.config.DisableEditor,
 	}

 	if s.config.ShowVersion {
@ -150,7 +153,7 @@ func (s *Server) Start() error {
 		logger:    s.logger,
 		db:        s.db,
 	}
-	r.Path("/{id:[a-zA-Z0-9]+}/{password:[a-zA-Z0-9]+}.html").Handler(protectedWebNoteHandler).Methods("GET")
+	r.Path("/{id:[a-zA-Z0-9]+}/{encryptionKey:[a-zA-Z0-9]+}.html").Handler(protectedWebNoteHandler).Methods("GET")

 	webNoteHandler := &GetWebNoteHandler{
 		Templates: templates,
@ -160,6 +163,10 @@ func (s *Server) Start() error {
 	}
 	r.Path("/{id:[a-zA-Z0-9]+}.html").Handler(webNoteHandler).Methods("GET")

+	if s.config.AceDirectory != "" {
+		r.PathPrefix("/static/ace-builds/").Handler(http.StripPrefix("/static/ace-builds/", http.FileServer(http.Dir(s.config.AceDirectory))))
+	}
+
 	if s.config.BootstrapDirectory != "" {
 		r.PathPrefix("/static/bootstrap/").Handler(http.StripPrefix("/static/bootstrap/", http.FileServer(http.Dir(s.config.BootstrapDirectory))))
 	}
@ -169,10 +176,10 @@ func (s *Server) Start() error {
 	addr := fmt.Sprintf("%s:%d", s.config.ListenAddress, s.config.ListenPort)

 	if s.config.HasTLS() {
-		s.logger.Info(fmt.Sprintf("listening to %s:%d (https)", s.config.ListenAddress, s.config.ListenPort))
+		s.logger.Info(fmt.Sprintf("listening to %s:%d", s.config.ListenAddress, s.config.ListenPort), slog.Any("scheme", "http"))
 		return http.ListenAndServeTLS(addr, s.config.TLSCertFile, s.config.TLSKeyFile, r)
 	} else {
-		s.logger.Info(fmt.Sprintf("listening to %s:%d (http)", s.config.ListenAddress, s.config.ListenPort))
+		s.logger.Info(fmt.Sprintf("listening to %s:%d", s.config.ListenAddress, s.config.ListenPort), slog.Any("scheme", "https"))
 		return http.ListenAndServe(addr, r)
 	}
 }
--- a/src/server/templates/head.html
+++ b/src/server/templates/head.html
@ -4,6 +4,8 @@
    <title>{{.Title}}</title>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <link href="{{if ne .BootstrapDirectory ``}}/static/bootstrap/css/bootstrap.min.css{{else}}https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css{{end}}" rel="stylesheet">
+    <link
+        href="{{if .BootstrapDirectory}}/static/bootstrap/css/bootstrap.min.css{{else}}https://cdn.jsdelivr.net/npm/bootstrap@5.3.8/dist/css/bootstrap.min.css{{end}}"
+        rel="stylesheet">
 </head>
 {{end}}
--- a/src/server/templates/index.html
+++ b/src/server/templates/index.html
@ -14,17 +14,17 @@
        <div class="container text-center justify-content-center w-75 mb-4">
            <div class="row align-items-center">
                <div class="col-1">
-                    <label class="col-form-label col-form-label-sm" for="password">Password</label>
+                    <label class="col-form-label col-form-label-sm" for="encryption-key">Encryption key</label>
                </div>
                <div class="col">
                    <input type="password" pattern="^[a-zA-Z0-9]{16,256}$"
-                        title="Letters and numbers with length from 16 to 256" class="form-control" id="password"
-                        name="password">
+                        title="Letters and numbers with length from 16 to 256" class="form-control" id="encryption-key"
+                        name="encryption-key">
                </div>
                <div class="col-1">
-                    <input type="checkbox" class="form-check-input" for="no-password" id="no-password"
-                        value="no-password" name="no-password">
-                    <label class="col-form-label col-form-label-sm" for="no-password">No password</label>
+                    <input type="checkbox" class="form-check-input" for="no-encryption-key" id="no-encryption-key"
+                        value="no-encryption-key" name="no-encryption-key">
+                    <label class="col-form-label col-form-label-sm" for="no-encryption-key">No encryption</label>
                </div>
                <div class="col-1">
                    <input type="checkbox" class="form-check-input" for="delete-after-read" id="delete-after-read"
@ -40,15 +40,17 @@
                    <select class="form-select" aria-label="Expiration" id="expiration" name="expiration">
                        <option disabled>Expiration</option>
                        {{range $exp := .Expirations}}
-                        <option {{ if eq $exp $.Expiration }}selected="selected"{{end}} value="{{$exp}}">{{HumanDuration $exp}}</option>
+                        <option {{ if eq $exp $.Expiration }}selected="selected" {{end}} value="{{$exp}}">
+                            {{HumanDuration $exp}}</option>
                        {{end}}
                    </select>
                </div>
                <div class="col">
                    <select class="form-select" aria-label="Language" id="language" name="language">
-                        <option selected="selected" value="" disabled>Language</option>
-                        {{range .Languages}}
-                        <option value="{{lower .}}">{{.}}</option>
+                        <option disabled>Language</option>
+                        {{range $language := .Languages}}
+                        <option {{ if eq $language $.Language }}selected="selected" {{end}}value="{{lower .}}">
+                            {{$language}}</option>
                        {{end}}
                    </select>
                </div>
@ -56,11 +58,15 @@
        </div>

        <div class="container mb-4">
+            {{if .DisableEditor}}
+            <textarea class="form-control" id="content" name="content" cols="40" rows="12"></textarea>
+            {{else}}
            <div class="row">
                <div id="editor" name="editor" class="form-control"
                    style="height: 300px; resize: vertical; overflow: auto;"></div>
                <input type="hidden" id="content" />
            </div>
+            {{end}}
        </div>
        <div class="container mb-4">
            <div class="row text-center justify-content-center">
@ -69,38 +75,40 @@
                </div>
            </div>
        </div>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.52.2/min/vs/loader.min.js"></script>
+        {{if eq false .DisableEditor}}
+        <script
+            src="{{if .AceDirectory}}/static/ace-builds{{else}}https://cdn.jsdelivr.net/npm/ace-builds@1.43.3{{end}}/src-noconflict/ace.js"
+            type="text/javascript" charset="utf-8"></script>
        <script>
-            require.config({ paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.52.2/min/vs' } });
+            var editor = ace.edit("editor");
+            if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
+                editor.setTheme("ace/theme/github_light_default");
+            } else {
+                editor.setTheme("ace/theme/github_dark");
+            }

-            require(['vs/editor/editor.main'], function () {
-                var editor = monaco.editor.create(document.getElementById('editor'), {
-                    theme: document.documentElement.getAttribute('data-bs-theme') == 'light' ? "vs" : "vs-dark",
-                    language: document.getElementById("language").value,
-                });
+            // Syntax highlighting
+            document.getElementById("language").addEventListener("change", (e) => {
+                if (e.target.value != "") {
+                    editor.getSession().setMode("ace/mode/" + e.target.value);
+                }
+            });

-                // Syntax highlighting
-                document.getElementById("language").addEventListener("change", (e) => {
-                    if (e.target.value != "") {
-                        monaco.editor.setModelLanguage(editor.getModel(), e.target.value);
-                    }
-                });
+            // Dark mode
+            document.getElementById("lightSwitch").addEventListener("click", () => {
+                if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
+                    editor.setTheme("ace/theme/github_light_default")
+                } else if (document.documentElement.getAttribute('data-bs-theme') == 'dark') {
+                    editor.setTheme("ace/theme/github_dark")
+                }
+            });

-                // Dark mode
-                document.getElementById("lightSwitch").addEventListener("click", () => {
-                    if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
-                        monaco.editor.setTheme("vs")
-                    } else if (document.documentElement.getAttribute('data-bs-theme') == 'dark') {
-                        monaco.editor.setTheme("vs-dark")
-                    }
-                });
-
-                // Copy content on submit
-                document.getElementById("form").addEventListener("formdata", (e) => {
-                    e.formData.append('content', editor.getModel().getValue());
-                });
+            // Copy content on submit
+            document.getElementById("form").addEventListener("formdata", (e) => {
+                e.formData.append('content', editor.getValue());
            });
        </script>
+        {{end}}
    </form>

    {{block "footer" .}}{{end}}
--- a/src/server/templates/note.html
+++ b/src/server/templates/note.html
@ -33,32 +33,44 @@
                {{end}}
            </ul>
        </div>
+        {{if .DisableEditor}}
+        <div class="row">
+            <pre class="border px-3 pt-3" style="min-height: 300px; resize: vertical; overflow: auto;">
+{{string .Note.Content}}
+            </pre>
+        </div>
+        {{else}}
        <div class="row">
            <div id="editor" name="editor" class="form-control"
-                style="height: 300px; resize: vertical; overflow: auto;"></div>
+                style="min-height: 300px; resize: vertical; overflow: auto;"></div>
        </div>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.52.2/min/vs/loader.min.js"></script>
+        <script
+            src="{{if .AceDirectory}}/static/ace-builds{{else}}https://cdn.jsdelivr.net/npm/ace-builds@1.43.3{{end}}/src-noconflict/ace.js"
+            type="text/javascript" charset="utf-8"></script>
        <script>
-            require.config({ paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.52.2/min/vs' } });
+            var editor = ace.edit("editor");
+            editor.setValue("{{string .Note.Content}}");
+            editor.setReadOnly(true);
+            editor.getSession().setMode("ace/mode/{{.Note.Language}}");
+            editor.getSession().selection.clearSelection();
+            editor.setOptions({maxLines: Infinity});

-            require(['vs/editor/editor.main'], function () {
-                var editor = monaco.editor.create(document.getElementById('editor'), {
-                    theme: document.documentElement.getAttribute('data-bs-theme') == 'light' ? "vs" : "vs-dark",
-                    language: "{{.Note.Language}}",
-                    readOnly: true,
-                    value: "{{string .Note.Content}}"
-                });
+            if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
+                editor.setTheme("ace/theme/github_light_default");
+            } else {
+                editor.setTheme("ace/theme/github_dark");
+            }

-                // Dark mode
-                document.getElementById("lightSwitch").addEventListener("click", () => {
-                    if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
-                        monaco.editor.setTheme("vs")
-                    } else if (document.documentElement.getAttribute('data-bs-theme') == 'dark') {
-                        monaco.editor.setTheme("vs-dark")
-                    }
-                });
+            // Dark mode
+            document.getElementById("lightSwitch").addEventListener("click", () => {
+                if (document.documentElement.getAttribute('data-bs-theme') == 'light') {
+                    editor.setTheme("ace/theme/github_light_default")
+                } else if (document.documentElement.getAttribute('data-bs-theme') == 'dark') {
+                    editor.setTheme("ace/theme/github_dark")
+                }
            });
        </script>
+        {{end}}
    </div>
    {{end}}
Author	SHA1	Message	Date
Julien Riou	e3ed4da99b	feat: disable editor All checks were successful / pre-commit (push) Successful in 1m47s Details Signed-off-by: Julien Riou <julien@riou.xyz>	2025-09-24 07:10:59 +02:00
Julien Riou	2ce17b0a3b	style: Simplify condition to load bootstrap Signed-off-by: Julien Riou <julien@riou.xyz>	2025-09-24 07:10:57 +02:00
Julien Riou	6d0ce573b3	feat: replace Monaco by Ace - Remove the Monaco Editor because it was to heavy and hard to integrate - Use Ace instead - Use the lowercase identifier for languages (ex: "Text" -> "text") - Select automatically the default language in the drop down to create a note (like the expiration) - Add `ace_directory` to serve assets from a local folder instead of a CDN - "hcl" syntax highlighting has been removed - "go" syntax highlighting has been renamed to "golang" Signed-off-by: Julien Riou <julien@riou.xyz>	2025-09-24 07:10:52 +02:00
Julien Riou	8e1dd686d3	feat: Rename password by encryption key All checks were successful / pre-commit (push) Successful in 1m9s Details Signed-off-by: Julien Riou <julien@riou.xyz>	2025-09-24 07:09:01 +02:00