.github/workflows/docker-tag.yaml

@@ -17,12 +17,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login git.jabuxas.com -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login git.jabuxas.xyz -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
       - name: Build and push Docker image
         run: |
-          docker build -t git.jabuxas.com/jabuxas/abyss:${{ github.ref_name }} .
-          docker push git.jabuxas.com/jabuxas/abyss:${{ github.ref_name }}
+          docker build -t git.jabuxas.xyz/jabuxas/abyss:${{ github.ref_name }} .
+          docker push git.jabuxas.xyz/jabuxas/abyss:${{ github.ref_name }}
 
       - name: Log out of Docker registry
-        run: docker logout git.jabuxas.com
+        run: docker logout git.jabuxas.xyz

.github/workflows/docker.yaml

@@ -20,12 +20,12 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to Docker registry
-        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login git.jabuxas.com -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+        run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login git.jabuxas.xyz -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
 
       - name: Build and push Docker image
         run: |
-          docker build -t git.jabuxas.com/jabuxas/abyss:latest .
-          docker push git.jabuxas.com/jabuxas/abyss:latest
+          docker build -t git.jabuxas.xyz/jabuxas/abyss:latest .
+          docker push git.jabuxas.xyz/jabuxas/abyss:latest
 
       - name: Log out of Docker registry
-        run: docker logout git.jabuxas.com
+        run: docker logout git.jabuxas.xyz

README.md

@@ -1,6 +1,6 @@
 # abyss
 
-abyss is a basic and _mostly_ single user pastebin server written in go made for uploading files (logs, images) and then sharing them to the internet
+abyss is a basic and mostly single user http server written in go made for uploading files (logs, images) and then sharing them to the internet
 
 <figure>
  <img src="https://github.com/user-attachments/assets/eae42368-d8b5-4c42-ac8a-0e1486fcd0d4" alt="homepage"/>
@@ -49,7 +49,7 @@ abyss is a basic and _mostly_ single user pastebin server written in go made for
   docker compose up -d # might be docker-compose depending on distro
   ```
 
-- you can optionally use the [docker image](https://git.jabuxas.com/jabuxas/-/packages/container/abyss/latest) directly and set it up how you want
+- you can optionally use the [docker image](https://git.jabuxas.xyz/jabuxas/-/packages/container/abyss/latest) directly and set it up how you want
 
 ### directly
 
@@ -78,8 +78,6 @@ abyss is a basic and _mostly_ single user pastebin server written in go made for
   curl -F "file=@/path/to/file" -H "X-Auth: "$(cat /path/to/.key) http://localhost:3235/
   ```
 
-- it is also possible to add a `-Fsecret=` to your POST to make filenames bigger and harder to guess.
-
 - you should probably create an `alias` or a `function` to do this automatically for you.
   <details>
   <summary>click for an example for bash/zsh:</summary>
@@ -168,7 +166,7 @@ abyss is a basic and _mostly_ single user pastebin server written in go made for
 - `UPLOAD_KEY`: this is key checked when uploading files. if the key doesn't match with server's one, then it refuses uploading.
 - `ABYSS_FILEDIR`: this points to the directory where abyss will save the uploads to. defaults to `./files`
 - `ABYSS_PORT`: this is the port the server will run on. safe to leave empty. defaults to 3235
-- `SHOULD_AUTH`: if it is `yes`, then to upload text you will need authentication (same auth as `/tree`), any value other than that and upload is authless
+- `SHOULD_AUTH`: if it is `yes`, then to upload text through the browser you will need authentication (same auth as `/tree`), any value other than that and upload is auth-less
 
 ## todo:
 

abyss.go

@@ -95,9 +95,17 @@ func setupHandlers(mux *http.ServeMux, app *Application) {
 		),
 	)
 
-	mux.HandleFunc("/last", BasicAuth(app.lastUploadedHandler, app))
+	mux.HandleFunc("/last", app.lastUploadedHandler)
 
 	mux.HandleFunc("/token", BasicAuth(app.createTokenHandler, app))
 
-	mux.HandleFunc("/raw/", app.fileHandler)
+	mux.HandleFunc("/files/", app.fileHandler)
+
+	if app.authUpload == "yes" {
+		mux.HandleFunc("/upload", BasicAuth(app.uploadHandler, app))
+		slog.Warn("text uploading through the browser will be restricted")
+	} else {
+		mux.HandleFunc("/upload", app.uploadHandler)
+		slog.Warn("text uploading through the browser will NOT be restricted")
+	}
 }

file_display.go

@@ -17,8 +17,6 @@ var extensions = map[string]string{
 
 	".png": "image", ".jpg": "image", ".jpeg": "image", ".webp": "image",
 
-	".mp3": "audio", ".aac": "audio", ".wav": "audio", ".flac": "audio", ".ogg": "audio",
-
 	".sh": "text", ".bash": "text", ".zsh": "text",
 	".bat": "text", ".cmd": "text", ".ps1": "text",
 	".ini": "text", ".cfg": "text", ".conf": "text",
@@ -47,10 +45,8 @@ func DisplayFile(app *Application, file string, w http.ResponseWriter) {
 		tmpl = template.Must(template.ParseFS(filesTemplate, "templates/files.html"))
 	}
 
-	realPath := filepath.Join(app.filesDir, filepath.Base(file))
-
-	fileStat, _ := os.Stat("./" + realPath)
-	fileContent, _ := os.ReadFile("./" + realPath)
+	fileStat, _ := os.Stat("." + file)
+	fileContent, _ := os.ReadFile("." + file)
 
 	fileInfo := FileInfo{
 		Name:    file,

generate_config.sh

@@ -43,7 +43,7 @@ AUTH_USERNAME=$AUTH_USERNAME
 # This is the password of the user for accessing /tree
 AUTH_PASSWORD=$AUTH_PASSWORD
 
-# This is whether you need a password to upload text (through browser or curl)
+# This is whether you need a password to upload text through the browser
 SHOULD_AUTH=$SHOULD_AUTH
 
 # This is the key needed to make uploads. Include it as X-Auth in curl.

handlers.go

@@ -81,16 +81,15 @@ func (app *Application) fileListingHandler(w http.ResponseWriter, r *http.Reques
 }
 
 func (app *Application) fileHandler(w http.ResponseWriter, r *http.Request) {
-	path := fmt.Sprintf("%s", filepath.Base(r.URL.Path))
-	realPath := filepath.Join(app.filesDir, path)
+	path := fmt.Sprintf(".%s", filepath.Clean(r.URL.Path))
 
-	if !filepath.IsLocal(realPath) {
+	if !filepath.IsLocal(path) {
 		http.Error(w, "Wrong url", http.StatusBadRequest)
 		return
 	}
 
-	if fileInfo, err := os.Stat(realPath); err == nil && !fileInfo.IsDir() {
-		http.ServeFile(w, r, realPath)
+	if fileInfo, err := os.Stat(path); err == nil && !fileInfo.IsDir() {
+		http.ServeFile(w, r, path)
 		return
 	}
 }
@@ -107,16 +106,16 @@ func (app *Application) indexHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	name := filepath.Base(r.URL.Path)
-	realPath := filepath.Join(app.filesDir, name)
+	name := filepath.Clean(r.URL.Path)
+	path := filepath.Join(app.filesDir, name)
 
-	if !filepath.IsLocal(realPath) || strings.Contains(r.URL.Path, filepath.Clean(app.filesDir)) {
+	if !filepath.IsLocal(path) {
 		http.Error(w, "Wrong url", http.StatusBadRequest)
 		return
 	}
 
-	if fileInfo, err := os.Stat(realPath); err == nil && !fileInfo.IsDir() {
-		DisplayFile(app, filepath.Join("/raw", name), w)
+	if fileInfo, err := os.Stat(path); err == nil && !fileInfo.IsDir() {
+		DisplayFile(app, "/"+path, w)
 		return
 	}
 
@@ -133,16 +132,12 @@ func (app *Application) lastUploadedHandler(w http.ResponseWriter, r *http.Reque
 		http.Error(w, "No new files uploaded yet", http.StatusNotFound)
 		return
 	}
-	DisplayFile(app, filepath.Join("/raw", filepath.Base(app.lastUploadedFile)), w)
+	DisplayFile(app, "/"+app.lastUploadedFile, w)
 }
 
 func (app *Application) uploadHandler(w http.ResponseWriter, r *http.Request) {
 	if contentType := r.Header.Get("Content-Type"); contentType == "application/x-www-form-urlencoded" {
-		if app.authUpload == "yes" {
-			BasicAuth(app.formHandler, app)(w, r)
-		} else {
-			app.formHandler(w, r)
-		}
+		app.formHandler(w, r)
 	} else if strings.Split(contentType, ";")[0] == "multipart/form-data" {
 		app.curlHandler(w, r)
 	} else {
@@ -163,11 +158,7 @@ func (app *Application) formHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer file.Close()
 
-	full := true
-	if len(r.Form["secret"]) == 0 {
-		full = false
-	}
-	filename := app.publicURL(file, ".txt", full)
+	filename := app.publicURL(file, ".txt")
 
 	// reopening file because hash consumes it
 	file, err = os.Open("/tmp/file.txt")
@@ -181,7 +172,7 @@ func (app *Application) formHandler(w http.ResponseWriter, r *http.Request) {
 		fmt.Fprintf(w, "Error parsing file: %s", err.Error())
 	}
 
-	ResponseURLHandler(r, w, app.url, filename)
+	ResponseURLHandler(w, app.url, filename)
 }
 
 func (app *Application) curlHandler(w http.ResponseWriter, r *http.Request) {
@@ -203,11 +194,7 @@ func (app *Application) curlHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer file.Close()
 
-	full := true
-	if len(r.Form["secret"]) == 0 {
-		full = false
-	}
-	filename := app.publicURL(file, filepath.Ext(handler.Filename), full)
+	filename := app.publicURL(file, filepath.Ext(handler.Filename))
 
 	// reopen the file for copying, as the hash process consumed the file reader
 	file, _, err = r.FormFile("file")
@@ -217,15 +204,16 @@ func (app *Application) curlHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	defer file.Close()
 
-	if err = SaveFile(app.lastUploadedFile, file); err != nil {
+	err = SaveFile(app.lastUploadedFile, file)
+	if err != nil {
 		fmt.Fprintf(w, "Error parsing file: %s", err.Error())
 	}
 
-	ResponseURLHandler(r, w, app.url, filename)
+	ResponseURLHandler(w, app.url, filename)
 }
 
-func (app *Application) publicURL(file io.Reader, extension string, full bool) string {
-	filename, _ := HashFile(file, extension, full)
+func (app *Application) publicURL(file io.Reader, extension string) string {
+	filename, _ := HashFile(file, extension)
 
 	filepath := filepath.Join(app.filesDir, filename)
 

helpers.go

@@ -9,7 +9,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"strings"
 
 	"github.com/golang-jwt/jwt/v5"
 )
@@ -68,19 +67,17 @@ func FormatFileSize(size int64) string {
 	return fmt.Sprintf("%.2f GB", float64(size)/(1024*1024*1024))
 }
 
-func HashFile(file io.Reader, extension string, full bool) (string, error) {
+func HashFile(file io.Reader, extension string) (string, error) {
 	hasher := md5.New()
 	if _, err := io.Copy(hasher, file); err != nil {
 		return "", err
 	}
 
-	sha1Hash := strings.ToUpper(hex.EncodeToString(hasher.Sum(nil)))
+	sha1Hash := hex.EncodeToString(hasher.Sum(nil))[:8]
+
 	filename := fmt.Sprintf("%s%s", sha1Hash, extension)
-	if full {
-		return filename, nil
-	} else {
-		return fmt.Sprintf("%s%s", sha1Hash[:5], extension), nil
-	}
+
+	return filename, nil
 }
 
 func SaveFile(name string, file io.Reader) error {
@@ -123,14 +120,12 @@ func BasicAuth(next http.HandlerFunc, app *Application) http.HandlerFunc {
 	})
 }
 
-func ResponseURLHandler(r *http.Request, w http.ResponseWriter, url, filename string) {
-	protocol := "http"
-	if r.TLS != nil || r.Header.Get("X-Forwarded-Proto") == "https" {
-		protocol = "https"
-	}
-	pasteURL := fmt.Sprintf("%s://%s/%s\n", protocol, url, filename)
+func ResponseURLHandler(w http.ResponseWriter, url, filename string) {
+	pasteURL := fmt.Sprintf("http://%s/%s\n", url, filename)
 
 	w.Header().Set("Location", pasteURL)
 
+	w.WriteHeader(http.StatusCreated)
+
 	fmt.Fprintf(w, "%s", pasteURL)
 }

static/index.html

@@ -20,9 +20,8 @@
         </a>
     </div>
 
-    <form action="/" method="POST">
-        <textarea name="content" placeholder="Enter your content here..."></textarea>
-        <br />
+    <form action="/upload" method="POST">
+        <textarea name="content" placeholder="Enter your content here..."></textarea><br />
         <button type="submit">upload</button>
     </form>
 

templates/files.html

@@ -133,10 +133,6 @@
             padding: 10px;
         }
 
-        header {
-            display: flex;
-        }
-
         .content {
             flex-grow: 1;
             display: flex;
@@ -197,31 +193,14 @@
         }
 
         a {
-            color: #d4d4d4;
+            color: #0288d1;
             text-decoration: none;
-            filter: brightness(0.7);
-            transition: filter 0.2s;
-        }
-
-        a:hover {
-            filter: brightness(1)
-        }
-
-        .path {
-            position: relative;
-            margin: 0 auto;
-            left: -1.85%;
         }
     </style>
 </head>
 
 <body>
-    <header>
-        <nav>
-            <a href="/">Home</a>
-        </nav>
-        <a href="{{.Name}}" class="path">{{.Path}}</a>
-    </header>
+    <header>{{.Path}}</header>
     <div class="content">
         {{if eq .Type "text"}}
         <pre>{{.Content}}</pre>
@@ -234,14 +213,12 @@
             <source src="{{.Name}}" type="video/mp4" />
             Your browser does not support the video tag.
         </video>
-        {{else if eq .Type "audio"}}
-        <audio controls src="{{.Name}}"><audio />
-            {{else}}
-            <p>
-                Couldn't detect file from extension, visit
-                <a href="http://{{.Path}}">this link</a> to see/download your file.
-            </p>
-            {{end}}
+        {{else}}
+        <p>
+            Couldn't detect file from extension, visit
+            <a href="http://{{.Path}}">this link</a> to see/download your file.
+        </p>
+        {{end}}
     </div>
     <footer>file uploaded in {{.TimeUploaded}}</footer>
 </body>