Merge remote-tracking branch 'refs/remotes/wg/master'

# Conflicts: # .github/CODEOWNERS # How_to_generate_an_bcrypt_hash.md # README.md # docker-compose.dev.yml # docker-compose.yml
2024-08-11 15:00:59 +07:00 · 2024-08-11 15:00:59 +07:00 · c607a96743
parent e9f57afbeb 8921d6c661
commit c607a96743
8 changed files with 45 additions and 39 deletions
--- a/How_to_generate_an_bcrypt_hash.md
+++ b/How_to_generate_an_bcrypt_hash.md
@ -13,16 +13,16 @@ To generate a bcrypt password hash using docker, run the following command :

 ```sh
 docker run ghcr.io/w0rng/amnezia-wg-easy wgpw YOUR_PASSWORD
-PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // litteraly YOUR_PASSWORD
+PASSWORD_HASH='$2b$12$coPqCsPtcFO.Ab99xylBNOW4.Iu7OOA2/ZIboHN6/oyxca3MWo7fW' // literally YOUR_PASSWORD
 ```

-*Important* : make sure to enclose your password in single quotes when you run `docker run` command :
+*Important* : make sure to enclose your password in **single quotes** when you run `docker run` command :

 ```bash
-$ echo $2b$12$coPqCsPtcF
+$ echo $2b$12$coPqCsPtcF <-- not correct
 b2
-$ echo "$2b$12$coPqCsPtcF"
+$ echo "$2b$12$coPqCsPtcF" <-- not correct
 b2
-$ echo '$2b$12$coPqCsPtcF'
+$ echo '$2b$12$coPqCsPtcF' <-- correct
 $2b$12$coPqCsPtcF
-```
+```
--- a/README.md
+++ b/README.md
@ -80,7 +80,6 @@ These options can be configured by setting environment variables using `-e KEY="
 | `PORT`                    | `51821`           | `6789`                         | TCP port for Web UI.                                                                                                                                                                                                     |
 | `WEBUI_HOST`              | `0.0.0.0`         | `localhost`                    | IP address web UI binds to.                                                                                                                                                                                              |
 | `PASSWORD_HASH`           | -                 | `$2y$05$Ci...`                 | When set, requires a password when logging in to the Web UI. See [How to generate an bcrypt hash.md]("https://github.com/wg-easy/wg-easy/blob/master/How_to_generate_an_bcrypt_hash.md") for know how generate the hash. |
-| `PASSWORD` (deprecated)   | -                 | `foobar123`                    | When set, requires a password when logging in to the Web UI. *(Not used if `PASSWORD_HASH` is set)*                                                                                                                      |
 | `WG_HOST`                 | -                 | `vpn.myserver.com`             | The public hostname of your VPN server.                                                                                                                                                                                  |
 | `WG_DEVICE`               | `eth0`            | `ens6f0`                       | Ethernet device the wireguard traffic should be forwarded through.                                                                                                                                                       |
 | `WG_PORT`                 | `51820`           | `12345`                        | The public UDP port of your VPN server. WireGuard will listen on that (othwise default) inside the Docker container.                                                                                                     |
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -5,7 +5,7 @@ services:
  amnezia-wg-easy:
    env_file:
      - .env
-    image: ghcr.io/spcfox/amnezia-wg-easy
+    image: ghcr.io/w0rng/amnezia-wg-easy
    container_name: amnezia-wg-easy
    volumes:
      - etc_wireguard:/etc/wireguard
@ -20,4 +20,4 @@ services:
      - net.ipv4.ip_forward=1
      - net.ipv4.conf.all.src_valid_mark=1
    devices:
-    - /dev/net/tun:/dev/net/tun
+    - /dev/net/tun:/dev/net/tun
--- a/src/package-lock.json
+++ b/src/package-lock.json
@ -13,12 +13,12 @@
        "debug": "^4.3.6",
        "express-session": "^1.18.0",
        "h3": "^1.12.0",
-        "qrcode": "^1.5.3"
+        "qrcode": "^1.5.4"
      },
      "devDependencies": {
        "eslint-config-athom": "^3.1.3",
        "nodemon": "^3.1.4",
-        "tailwindcss": "^3.4.7"
+        "tailwindcss": "^3.4.9"
      },
      "engines": {
        "node": ">=18"
@ -1456,12 +1456,6 @@
      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
      "license": "MIT"
    },
-    "node_modules/encode-utf8": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz",
-      "integrity": "sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw==",
-      "license": "MIT"
-    },
    "node_modules/enquirer": {
      "version": "2.4.1",
      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
@ -2312,9 +2306,9 @@
      }
    },
    "node_modules/foreground-child": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
-      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
      "dev": true,
      "license": "ISC",
      "dependencies": {
@ -3769,9 +3763,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.40",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
-      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
+      "version": "8.4.41",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz",
+      "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==",
      "dev": true,
      "funding": [
        {
@ -3972,13 +3966,12 @@
      }
    },
    "node_modules/qrcode": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.3.tgz",
-      "integrity": "sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==",
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
+      "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
      "license": "MIT",
      "dependencies": {
        "dijkstrajs": "^1.0.1",
-        "encode-utf8": "^1.0.3",
        "pngjs": "^5.0.0",
        "yargs": "^15.3.1"
      },
@ -4694,9 +4687,9 @@
      "peer": true
    },
    "node_modules/tailwindcss": {
-      "version": "3.4.7",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.7.tgz",
-      "integrity": "sha512-rxWZbe87YJb4OcSopb7up2Ba4U82BoiSGUdoDr3Ydrg9ckxFS/YWsvhN323GMcddgU65QRy7JndC7ahhInhvlQ==",
+      "version": "3.4.9",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.9.tgz",
+      "integrity": "sha512-1SEOvRr6sSdV5IDf9iC+NU4dhwdqzF4zKKq3sAbasUWHEM6lsMhX+eNN5gkPx1BvLFEnZQEUFbXnGj8Qlp83Pg==",
      "dev": true,
      "license": "MIT",
      "dependencies": {
--- a/src/package.json
+++ b/src/package.json
@ -19,12 +19,12 @@
    "debug": "^4.3.6",
    "express-session": "^1.18.0",
    "h3": "^1.12.0",
-    "qrcode": "^1.5.3"
+    "qrcode": "^1.5.4"
  },
  "devDependencies": {
    "eslint-config-athom": "^3.1.3",
    "nodemon": "^3.1.4",
-    "tailwindcss": "^3.4.7"
+    "tailwindcss": "^3.4.9"
  },
  "nodemonConfig": {
    "ignore": [
--- a/src/www/css/app.css
+++ b/src/www/css/app.css
@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.4.7 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.9 | MIT License | https://tailwindcss.com
 */

 /*
--- a/src/www/index.html
+++ b/src/www/index.html
@ -10,6 +10,7 @@
  <link rel="apple-touch-icon" href="./img/apple-touch-icon.png">
  <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover">
  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 </head>
 <style>
  [v-cloak] {
@ -559,7 +560,7 @@
            </svg>
          </div>

-          <input type="password" name="password" :placeholder="$t('password')" v-model="password"
+          <input type="password" name="password" :placeholder="$t('password')" v-model="password" autocomplete="current-password"
            class="px-3 py-2 text-sm dark:bg-neutral-700 text-gray-500 dark:text-gray-500 mb-5 border-2 border-gray-100 dark:border-neutral-800 rounded-lg w-full focus:border-red-800 dark:focus:border-red-800 dark:placeholder:text-neutral-400 outline-none" />

          <button v-if="authenticating"
@ -608,4 +609,4 @@
  <script src="./js/app.js"></script>
 </body>

-</html>
+</html>
--- a/src/www/js/i18n.js
+++ b/src/www/js/i18n.js
@ -57,10 +57,17 @@ const messages = { // eslint-disable-line no-unused-vars
    disableClient: 'Вимкнути клієнта',
    enableClient: 'Увімкнути клієнта',
    noClients: 'Ще немає клієнтів.',
+    noPrivKey: 'У цього клієнта немає відомого приватного ключа. Неможливо створити конфігурацію.',
    showQR: 'Показати QR-код',
    downloadConfig: 'Завантажити конфігурацію',
    madeBy: 'Зроблено',
    donate: 'Пожертвувати',
+    toggleCharts: 'Показати/сховати діаграми',
+    theme: { dark: 'Темна тема', light: 'Світла тема', auto: 'Автоматична тема' },
+    restore: 'Відновити',
+    backup: 'Резервна копія',
+    titleRestoreConfig: 'Відновити конфігурацію',
+    titleBackupConfig: 'Створити резервну копію конфігурації',
  },
  ru: {
    name: 'Имя',
@ -110,19 +117,25 @@ const messages = { // eslint-disable-line no-unused-vars
    deleteDialog2: 'Bu işlem geri alınamaz.',
    cancel: 'İptal',
    create: 'Oluştur',
-    createdAt: 'Şu saatte oluşturuldu: ',
+    createdOn: 'Şu saatte oluşturuldu: ',
    lastSeen: 'Son görülme tarihi: ',
    totalDownload: 'Toplam İndirme: ',
    totalUpload: 'Toplam Yükleme: ',
    newClient: 'Yeni Kullanıcı',
-    disableClient: 'İstemciyi Devre Dışı Bırak',
-    enableClient: 'İstemciyi Etkinleştir',
+    disableClient: 'Kullanıcıyı Devre Dışı Bırak',
+    enableClient: 'Kullanıcıyı Etkinleştir',
    noClients: 'Henüz kullanıcı yok.',
+    noPrivKey: 'Bu istemcinin bilinen bir özel anahtarı yok. Yapılandırma oluşturulamıyor.',
    showQR: 'QR Kodunu Göster',
    downloadConfig: 'Yapılandırmayı İndir',
    madeBy: 'Yapan Kişi: ',
    donate: 'Bağış Yap',
-    changeLang: 'Dil Değiştir',
+    toggleCharts: 'Grafiği göster/gizle',
+    theme: { dark: 'Karanlık tema', light: 'Açık tema', auto: 'Otomatik tema' },
+    restore: 'Geri yükle',
+    backup: 'Yedekle',
+    titleRestoreConfig: 'Yapılandırmanızı geri yükleyin',
+    titleBackupConfig: 'Yapılandırmanızı yedekleyin',
  },
  no: { // github.com/digvalley
    name: 'Navn',