Merge branch 'main' of gitea.scu.si:Florian.Walther/Web-Password

.gitea/workflows/docker-build-push.yml

@@ -1,29 +0,0 @@
-name: Docker Build and Push
-#on: [push]
-on:
-  workflow_dispatch:
-
-jobs:
-  build-and-push:
-    runs-on: docker
-    if: branch == 'main'
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Login to Registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login ${{ secrets.REGISTRY_URL }} -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
-
-      - name: Build Docker Image
-        run: |
-          docker build -t ${{ secrets.REGISTRY_URL }}/FlorianWalther/password-generator:latest .
-
-      - name: Push Docker Image
-        run: |
-          docker push ${{ secrets.REGISTRY_URL }}/FlorianWalther/password-generator:latest
-
-      - name: Cleanup
-        run: |
-          docker system prune -f
-

.gitea/workflows/docker-release.yml

@@ -14,8 +14,8 @@ jobs:
       - name: Login to Gitea
         uses: docker/login-action@v3
         with:
-          registry: ${{ secrets.REGISTRY_URL }} # gitea.scu.si
-          username: ${{ gitea.actor }}
+          registry: ${{ vars.REGISTRY_URL }} # gitea.scu.si
+          username: ${{ secrets.REGISTRY_USER }}
           password: ${{ secrets.REGISTRY_PASSWORD }}
 
       - name: Build and push
@@ -26,5 +26,5 @@ jobs:
           # Hier wird die Git-Referenz automatisch als Docker-Tag genutzt
           #tags: gitea.scu.si/florianwalther/password-generator:${{ gitea.ref_name }}
           tags: |
-            gitea.scu.si/florianwalther/password-generator:${{ gitea.ref_name }}
-            gitea.scu.si/florianwalther/password-generator:latest
+            gitea.scu.si/florian.walther/password-generator:${{ gitea.ref_name }}
+            gitea.scu.si/florian.walther/password-generator:latest

README.md

@@ -1,6 +1,6 @@
 # Web-Password
 
-_a web based password generator_
+_a web based password generator, with an API endpoint_
 
 ![App Screenshot](img/screenshot.png)
 
@@ -16,7 +16,7 @@ There is a demo at [https://passwd.scu.si](https://passwd.scu.si)
 
 ## Usage
 
-The follwoing example shows how to get up your own instance with `docker compose`.
+The following example shows how to get up your own instance with `docker compose`.
 
 ```
 git clone https://gitea.scu.si/FlorianWalther/Web-Password.git
@@ -26,4 +26,15 @@ docker compose pull
 docker compose up -d
 ```
 
+## Docker image
+
+The latest official docker image is at [https://gitea.scu.si/FlorianWalther/-/packages/container/password-generator/latest](https://gitea.scu.si/FlorianWalther/-/packages/container/password-generator/latest)
+
+You can pull it like this:
+```
+docker pull gitea.scu.si/florian.walther/password-generator:latest
+```
+
+## more usage examples
+
 There are some more usage example in [misc/MoreUsage.md](misc/MoreUsage.md)

main.go

@@ -9,8 +9,22 @@ import (
 
 const (
 	passwordLength = 32
+	// Zeichensatz mit 62 möglichen Zeichen pro Position
 	chars          = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-	//chars          = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789!?$%&=#+<>-:,.;_*@"
+
+        // Zeichensatz mit 58 möglichen Zeichen pro Position
+        // Verwechslungsanfällige Zeichen (0, O, 1, l, I) sind nicht enthalten.
+        //
+        // ## Security Note: ################################################
+        // Der reduzierte Zeichensatz setzt den Keyspace von 10^57 auf 10^56 herab.
+        // Die Entropie wird von ~192.6 Bit auf ~190.6 Bit herabgesetzt.
+        // Solange die Passwortlänge von 32 Zeichen beibehalten wird ist der
+        // Sicherheitsverlust durch einen reduzierten Zeichensatz akzeptabel,
+        // weil der Keyspace immer noch so groß ist dass ein erraten praktisch
+        // unmöglich ist.
+        //
+        //const chars = "ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnpqrstuvwxyz23456789"
+
 )
 
 func generatePassword() string {
@@ -28,11 +42,14 @@ func generatePassword() string {
 }
 
 func passwordHandler(w http.ResponseWriter, r *http.Request) {
+        log.Printf("APIHandler called from %s\n", r.RemoteAddr)
 	password := generatePassword()
 	fmt.Fprint(w, password)
 }
 
+// new help handler
 func helpHandler(w http.ResponseWriter, r *http.Request) {
+	log.Printf("helpHandler called from %s\n", r.RemoteAddr)
 	helpHTML := `
 	<!DOCTYPE html>
 	<html>
@@ -40,6 +57,34 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 		<title>Hilfe</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<style>
+  :root {
+    --bg-color: #f5f5f5;
+    --text-color: #333;
+    --container-bg: white;
+    --button-bg: #007BFF;
+    --button-hover: #0056b3;
+    --copy-button-bg: #4CAF50;
+    --copy-button-hover: #45a049;
+    --password-bg: #f0f0f0;
+    --border-color: #ddd;
+    --shadow-color: rgba(0, 0, 0, 0.1);
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --bg-color: #121212;
+      --text-color: #e0e0e0;
+      --container-bg: #1e1e1e;
+      --button-bg: #2a7df4;
+      --button-hover: #1a5fb4;
+      --copy-button-bg: #4caf60;
+      --copy-button-hover: #3d8b40;
+      --password-bg: #2d2d2d;
+      --border-color: #444;
+      --shadow-color: rgba(0, 0, 0, 0.3);
+    }
+  }
+
   body {
     font-family: 'Helvetica Neue', Arial, sans-serif;
     display: flex;
@@ -47,35 +92,130 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
     align-items: center;
     height: 100vh;
     margin: 0;
-				background-color: #f5f5f5;
-				color: #333;
+    background-color: var(--bg-color);
+    color: var(--text-color);
+    transition: background-color 0.3s, color 0.3s;
   }
-			.help-container {
-				text-align: left;
-				background: white;
+
+  .container {
+    text-align: center;
+    background: var(--container-bg);
     padding: 2rem;
     border-radius: 8px;
-				box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-				max-width: 800px;
+    box-shadow: 0 2px 10px var(--shadow-color);
     width: 90%;
     min-width: 600px;
+    position: relative;
   }
+
   h1 {
     font-size: 1.5rem;
     margin-bottom: 1.5rem;
-				color: #444;
+    color: var(--text-color);
   }
-			pre {
+
+  #password {
     font-family: 'Courier New', Courier, monospace;
-				background: #f0f0f0;
+    font-size: 1.2rem;
+    letter-spacing: 1px;
+    margin: 1rem auto;
     padding: 0.8rem;
+    background: var(--password-bg);
     border-radius: 4px;
-				overflow-x: auto;
+    border: 1px solid var(--border-color);
+    width: 90%;
+    word-break: break-all;
+    color: var(--text-color);
   }
-			a {
-				color: #007BFF;
+
+  .copy-button {
+    background: var(--copy-button-bg);
+    color: white;
+    border: none;
+    padding: 0.6rem 1.2rem;
+    font-size: 1rem;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background 0.2s;
+    margin: 0.3rem;
+  }
+
+  .copy-button:hover {
+    background: var(--copy-button-hover);
+  }
+
+  .renew-button {
+    background: var(--button-bg);
+    color: white;
+    border: none;
+    padding: 0.6rem 1.2rem;
+    font-size: 1rem;
+    border-radius: 4px;
+    cursor: pointer;
+    transition: background 0.2s;
+    margin: 0.3rem;
+  }
+
+  .renew-button:hover {
+    background: var(--button-hover);
+  }
+
+  .help-link {
+    position: absolute;
+    top: 1rem;
+    right: 1rem;
+    font-size: 1.2rem;
+    color: var(--text-color);
+    opacity: 0.7;
     text-decoration: none;
   }
+
+  .help-link:hover {
+    opacity: 1;
+  }
+
+  #toast {
+    visibility: hidden;
+    min-width: 150px;
+    background-color: var(--copy-button-bg);
+    color: white;
+    text-align: center;
+    border-radius: 4px;
+    padding: 0.5rem;
+    position: fixed;
+    top: 20px;
+    right: 20px;
+    z-index: 1;
+    font-size: 0.9rem;
+    box-shadow: 0 2px 10px var(--shadow-color);
+  }
+
+  .help-container {
+    text-align: left;
+    background: var(--container-bg);
+    padding: 2rem;
+    border-radius: 8px;
+    box-shadow: 0 2px 10px var(--shadow-color);
+    max-width: 800px;
+    width: 90%;
+    min-width: 600px;
+    color: var(--text-color);
+  }
+
+  pre {
+    font-family: 'Courier New', Courier, monospace;
+    background: var(--password-bg);
+    padding: 0.8rem;
+    border-radius: 4px;
+    color: var(--text-color);
+    border: 1px solid var(--border-color);
+  }
+
+  a {
+    color: var(--button-bg);
+    text-decoration: none;
+  }
+
   a:hover {
     text-decoration: underline;
   }
@@ -101,6 +241,58 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 				<a href="/">Zurück zur Passwort-Generierung</a>
 			</p>
 		</div>
+		<script>
+  // Darkmode-Toggle-Funktion (optional)
+  function toggleDarkMode() {
+    const root = document.documentElement;
+    const isDark = root.style.getPropertyValue('--bg-color') === 'rgb(18, 18, 18)';
+    if (isDark) {
+      // Zu Lightmode wechseln
+      root.style.setProperty('--bg-color', '#f5f5f5');
+      root.style.setProperty('--text-color', '#333');
+      root.style.setProperty('--container-bg', 'white');
+      root.style.setProperty('--button-bg', '#007BFF');
+      root.style.setProperty('--button-hover', '#0056b3');
+      root.style.setProperty('--copy-button-bg', '#4CAF50');
+      root.style.setProperty('--copy-button-hover', '#45a049');
+      root.style.setProperty('--password-bg', '#f0f0f0');
+      root.style.setProperty('--border-color', '#ddd');
+      root.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.1)');
+      localStorage.setItem('theme', 'light');
+    } else {
+      // Zu Darkmode wechseln
+      root.style.setProperty('--bg-color', '#121212');
+      root.style.setProperty('--text-color', '#e0e0e0');
+      root.style.setProperty('--container-bg', '#1e1e1e');
+      root.style.setProperty('--button-bg', '#2a7df4');
+      root.style.setProperty('--button-hover', '#1a5fb4');
+      root.style.setProperty('--copy-button-bg', '#4caf60');
+      root.style.setProperty('--copy-button-hover', '#3d8b40');
+      root.style.setProperty('--password-bg', '#2d2d2d');
+      root.style.setProperty('--border-color', '#444');
+      root.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.3)');
+      localStorage.setItem('theme', 'dark');
+    }
+  }
+
+  // Prüfe, ob Nutzer eine manuelle Einstellung gespeichert hat
+  if (localStorage.getItem('theme') === 'dark') {
+    toggleDarkMode();
+  } else if (localStorage.getItem('theme') === 'light') {
+    // Stelle sicher, dass Lightmode aktiv ist (falls Systemtheme dark ist)
+    document.documentElement.style.setProperty('--bg-color', '#f5f5f5');
+    document.documentElement.style.setProperty('--text-color', '#333');
+    document.documentElement.style.setProperty('--container-bg', 'white');
+    document.documentElement.style.setProperty('--button-bg', '#007BFF');
+    document.documentElement.style.setProperty('--button-hover', '#0056b3');
+    document.documentElement.style.setProperty('--copy-button-bg', '#4CAF50');
+    document.documentElement.style.setProperty('--copy-button-hover', '#45a049');
+    document.documentElement.style.setProperty('--password-bg', '#f0f0f0');
+    document.documentElement.style.setProperty('--border-color', '#ddd');
+    document.documentElement.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.1)');
+  }
+</script>
+
 	</body>
 	</html>
 	`
@@ -108,7 +300,9 @@ func helpHandler(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprint(w, helpHTML)
 }
 
+
 func webHandler(w http.ResponseWriter, r *http.Request) {
+	log.Printf("webHandler called from %s\n", r.RemoteAddr)
 	password := generatePassword()
 html := fmt.Sprintf(
     `<DOCTYPE html>
@@ -117,6 +311,34 @@ html := fmt.Sprintf(
         <title>Passwort-Generator</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 				<style>
+  :root {
+    --bg-color: #f5f5f5;
+    --text-color: #333;
+    --container-bg: white;
+    --button-bg: #007BFF;
+    --button-hover: #0056b3;
+    --copy-button-bg: #4CAF50;
+    --copy-button-hover: #45a049;
+    --password-bg: #f0f0f0;
+    --border-color: #ddd;
+    --shadow-color: rgba(0, 0, 0, 0.1);
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --bg-color: #121212;
+      --text-color: #e0e0e0;
+      --container-bg: #1e1e1e;
+      --button-bg: #2a7df4;
+      --button-hover: #1a5fb4;
+      --copy-button-bg: #4caf60;
+      --copy-button-hover: #3d8b40;
+      --password-bg: #2d2d2d;
+      --border-color: #444;
+      --shadow-color: rgba(0, 0, 0, 0.3);
+    }
+  }
+
   body {
     font-family: 'Helvetica Neue', Arial, sans-serif;
     display: flex;
@@ -124,38 +346,44 @@ html := fmt.Sprintf(
     align-items: center;
     height: 100vh;
     margin: 0;
-                background-color: #f5f5f5;
-                color: #333;
+    background-color: var(--bg-color);
+    color: var(--text-color);
+    transition: background-color 0.3s, color 0.3s;
   }
+
   .container {
     text-align: center;
-                background: white;
+    background: var(--container-bg);
     padding: 2rem;
     border-radius: 8px;
-                box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
-                width: 90%%;
+    box-shadow: 0 2px 10px var(--shadow-color);
+    width: 90%;
     min-width: 600px;
     position: relative;
   }
+
   h1 {
     font-size: 1.5rem;
     margin-bottom: 1.5rem;
-                color: #444;
+    color: var(--text-color);
   }
+
   #password {
     font-family: 'Courier New', Courier, monospace;
     font-size: 1.2rem;
     letter-spacing: 1px;
     margin: 1rem auto;
     padding: 0.8rem;
-                background: #f0f0f0;
+    background: var(--password-bg);
     border-radius: 4px;
-                border: 1px solid #ddd;
-                width: 90%%;
+    border: 1px solid var(--border-color);
+    width: 90%;
     word-break: break-all;
+    color: var(--text-color);
   }
+
   .copy-button {
-                background: #4CAF50;
+    background: var(--copy-button-bg);
     color: white;
     border: none;
     padding: 0.6rem 1.2rem;
@@ -165,11 +393,13 @@ html := fmt.Sprintf(
     transition: background 0.2s;
     margin: 0.3rem;
   }
+
   .copy-button:hover {
-                background: #45a049;
+    background: var(--copy-button-hover);
   }
+
   .renew-button {
-                background: #007BFF;
+    background: var(--button-bg);
     color: white;
     border: none;
     padding: 0.6rem 1.2rem;
@@ -179,40 +409,29 @@ html := fmt.Sprintf(
     transition: background 0.2s;
     margin: 0.3rem;
   }
+
   .renew-button:hover {
-                background: #0056b3;
-            }
-            .about-link {
-                position: absolute;
-                top: 1rem;
-                left: 1rem;
-                font-size: 1.2rem;
-                color: #999;
-                text-decoration: none;
-            }
-            .about-link:hover {
-                color: #444;
+    background: var(--button-hover);
   }
+
   .help-link {
     position: absolute;
     top: 1rem;
     right: 1rem;
     font-size: 1.2rem;
-                color: #999;
+    color: var(--text-color);
+    opacity: 0.7;
     text-decoration: none;
   }
+
   .help-link:hover {
-                color: #444;
-            }
-            .buttons {
-                display: flex;
-                justify-content: center;
-                gap: 0.5rem;
+    opacity: 1;
   }
+
   #toast {
     visibility: hidden;
     min-width: 150px;
-                background-color: #4CAF50;
+    background-color: var(--copy-button-bg);
     color: white;
     text-align: center;
     border-radius: 4px;
@@ -222,13 +441,45 @@ html := fmt.Sprintf(
     right: 20px;
     z-index: 1;
     font-size: 0.9rem;
-                box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 10px var(--shadow-color);
+  }
+
+  .help-container {
+    text-align: left;
+    background: var(--container-bg);
+    padding: 2rem;
+    border-radius: 8px;
+    box-shadow: 0 2px 10px var(--shadow-color);
+    max-width: 800px;
+    width: 90%;
+    min-width: 600px;
+    color: var(--text-color);
+  }
+
+  pre {
+    font-family: 'Courier New', Courier, monospace;
+    background: var(--password-bg);
+    padding: 0.8rem;
+    border-radius: 4px;
+    color: var(--text-color);
+    border: 1px solid var(--border-color);
+  }
+
+  a {
+    color: var(--button-bg);
+    text-decoration: none;
+  }
+
+  a:hover {
+    text-decoration: underline;
   }
         </style>
     </head>
     <body>
         <div class="container">
             <a href="/help" class="help-link">API</a>
+            <button onclick="toggleDarkMode()" style="position: absolute; top: 1rem; left: 1rem; background: transparent; border: none; color: var(--text-color); font-size: 1.2rem; cursor: pointer;">🌓</button>
+
             <a class="about-link" href="https://gitea.scu.si/FlorianWalther/Web-Password">code</a>
             <h1>Generiertes Passwort</h1>
             <div id="password">%s</div>
@@ -261,6 +512,58 @@ html := fmt.Sprintf(
                     .catch(error => console.error("Fehler:", error));
             }
         </script>
+				<script>
+  // Darkmode-Toggle-Funktion (optional)
+  function toggleDarkMode() {
+    const root = document.documentElement;
+    const isDark = root.style.getPropertyValue('--bg-color') === 'rgb(18, 18, 18)';
+    if (isDark) {
+      // Zu Lightmode wechseln
+      root.style.setProperty('--bg-color', '#f5f5f5');
+      root.style.setProperty('--text-color', '#333');
+      root.style.setProperty('--container-bg', 'white');
+      root.style.setProperty('--button-bg', '#007BFF');
+      root.style.setProperty('--button-hover', '#0056b3');
+      root.style.setProperty('--copy-button-bg', '#4CAF50');
+      root.style.setProperty('--copy-button-hover', '#45a049');
+      root.style.setProperty('--password-bg', '#f0f0f0');
+      root.style.setProperty('--border-color', '#ddd');
+      root.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.1)');
+      localStorage.setItem('theme', 'light');
+    } else {
+      // Zu Darkmode wechseln
+      root.style.setProperty('--bg-color', '#121212');
+      root.style.setProperty('--text-color', '#e0e0e0');
+      root.style.setProperty('--container-bg', '#1e1e1e');
+      root.style.setProperty('--button-bg', '#2a7df4');
+      root.style.setProperty('--button-hover', '#1a5fb4');
+      root.style.setProperty('--copy-button-bg', '#4caf60');
+      root.style.setProperty('--copy-button-hover', '#3d8b40');
+      root.style.setProperty('--password-bg', '#2d2d2d');
+      root.style.setProperty('--border-color', '#444');
+      root.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.3)');
+      localStorage.setItem('theme', 'dark');
+    }
+  }
+
+  // Prüfe, ob Nutzer eine manuelle Einstellung gespeichert hat
+  if (localStorage.getItem('theme') === 'dark') {
+    toggleDarkMode();
+  } else if (localStorage.getItem('theme') === 'light') {
+    // Stelle sicher, dass Lightmode aktiv ist (falls Systemtheme dark ist)
+    document.documentElement.style.setProperty('--bg-color', '#f5f5f5');
+    document.documentElement.style.setProperty('--text-color', '#333');
+    document.documentElement.style.setProperty('--container-bg', 'white');
+    document.documentElement.style.setProperty('--button-bg', '#007BFF');
+    document.documentElement.style.setProperty('--button-hover', '#0056b3');
+    document.documentElement.style.setProperty('--copy-button-bg', '#4CAF50');
+    document.documentElement.style.setProperty('--copy-button-hover', '#45a049');
+    document.documentElement.style.setProperty('--password-bg', '#f0f0f0');
+    document.documentElement.style.setProperty('--border-color', '#ddd');
+    document.documentElement.style.setProperty('--shadow-color', 'rgba(0, 0, 0, 0.1)');
+  }
+</script>
+
     </body>
     </html>`,
     password,
@@ -278,4 +581,3 @@ func main() {
 	log.Println("Plain-Text-Passwort: curl http://localhost:8080/api/password")
 	log.Fatal(http.ListenAndServe(":8080", nil))
 }
-

misc/MoreUsage.md

@@ -1,31 +1,66 @@
+## bash alias
 
+You can configure an bash alias in your `~/.bashrc` like this:
 
-# Baue die Go-Anwendung
+```
+## genpasswd alias
+alias genpasswd='echo $(curl -s https://passwd.scu.si/api/password)'
+```
+
+After making above changes you have to reload your ~/bashrc, in order to activate your changes.
+```
+. ~/.bashrc
+```
+
+Now you can enter `genpasswd` and get a fresh password from the API Endpoint.
+
+## get 10 fresh passwords
+
+```bash
+for i in {1..10}; do echo $(curl -s https://passwd.scu.si/api/password); done
+```
+
+# building the app
+
+you can build the app yourself like this:
 
 ```
 go build -o password-generator ./
 ```
 
-# Baue das Docker-Image
+
+
+# build a docker container
 
 ```
 docker build -t password-generator .
 ```
 
-# Starte den Docker Container
+# start the docker container
 
 ```
 docker run -p 8080:8080 password-generator
 ```
 
-## mit docker-compose
+## docker-compose
 
-Ein `docker-compose.yml` wird mitgeliefert.
+There are two example docker-compose files in the [misc](./) directory.
+
+### docker-compose.yml
+
+A basic variant that just brings up the container and export port 8080.
+The basic variant can be used without modifications.
+
+### docker-compose.traefik.yml
+
+The other one is meant to be used behind a traefik reverse proxy.
+This variant has lables to configure traefik accordingly.
+The traefik variant needs to be adjusted to your environment before 
+you can use it successfully.
 
 ### initial pull
 
 ```
-docker compose login gitea.scu.si
 docker compose pull
 ```
 
@@ -41,5 +76,12 @@ docker compose up -d
 docker compose down
 ```
 
+### update container
+
+In order to update your container to the current version, do this:
+```
+docker compose pull
+docker compose up -d
+```
 
 

misc/docker-compose.traefik.yml

@@ -5,8 +5,6 @@ services:
     restart: always
     expose:
       - "8080:8080"
-    # Falls die Registry privat ist, muss der Host zuvor mit 
-    # 'docker login gitea.scu.si' angemeldet worden sein.
     labels:
       - "traefik.enable=true"
       - "traefik.docker.network=traefik_backend"