diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..399fd107 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "JavaScript" "HTML" "Docker" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..5f7c47fc --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,72 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ "main" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "main" ] + schedule: + - cron: '30 2 * * 3' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'javascript' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ] + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + + # If the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 diff --git a/.github/workflows/deploy-nightly.yml b/.github/workflows/deploy-nightly.yml deleted file mode 100644 index efff9525..00000000 --- a/.github/workflows/deploy-nightly.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build & Publish Docker Image to Docker Hub - -on: - workflow_dispatch: - schedule: - - cron: "0 12 * * *" - -jobs: - deploy: - name: Build & Deploy - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: production - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - # Set environment variables - - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV - - # Build & Publish - - name: Build & Publish Docker Image - uses: docker/build-push-action@v2 - with: - push: true - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 - tags: weejewel/wg-easy:nightly, weejewel/wg-easy:${{ env.RELEASE }}-nightly diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml deleted file mode 100644 index 0f2fe55d..00000000 --- a/.github/workflows/deploy.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Build & Publish Docker Image to Docker Hub - -on: - workflow_dispatch: - push: - branches: - - production - - production/** - -jobs: - deploy: - name: Build & Deploy - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: production - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - # Set environment variables - - run: echo RELEASE=$(cat ./src/package.json | jq -r .release) >> $GITHUB_ENV - - # Build & Publish - - name: Build & Publish Docker Image - uses: docker/build-push-action@v2 - with: - push: true - platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8 - tags: weejewel/wg-easy:latest, weejewel/wg-easy:${{ env.RELEASE }} diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index b2a65b9f..00000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Lint - -on: - push: - branches: - - master - - production - pull_request: - -jobs: - lint: - name: Lint - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-node@v1 - with: - node-version: '14' - - - run: | - cd src - npm ci - npm run lint diff --git a/.gitignore b/.gitignore index 77574b5e..d0a88d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,9 @@ /config /wg0.conf -/wg0.json \ No newline at end of file +/wg0.json +.DS_Store + +# General +.DS_Store +.AppleDouble +.LSOverride \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 2695361f..de3d041c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,5 @@ -# There's an issue with node:16-alpine. -# On Raspberry Pi, the following crash happens: - -# #FailureMessage Object: 0x7e87753c -# # -# # Fatal error in , line 0 -# # unreachable code -# # -# # -# # - -FROM docker.io/library/node:14-alpine@sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 AS build_node_modules +# There's an issue with node:16-alpine on pi +FROM node:16.15.1-alpine AS build_node_modules # Copy Web UI COPY src/ /app/ @@ -18,7 +8,7 @@ RUN npm ci --production # Copy build result to a new image. # This saves a lot of disk space. -FROM docker.io/library/node:14-alpine@sha256:dc92f36e7cd917816fa2df041d4e9081453366381a00f40398d99e9392e78664 +FROM node:16.15.1-alpine COPY --from=build_node_modules /app /app # Move node_modules one directory up, so during development diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7a0a4c12 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2022 Gyarbij + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 0548bb6a..00000000 --- a/LICENSE.md +++ /dev/null @@ -1,11 +0,0 @@ -**You may:** - -* Use this software for yourself; -* Use this software for a company; -* Modify this software, as long as you: - * Publish the changes on GitHub as an open-source & linked fork; - * Don't remove any links to the original project or donation pages; - -**You may not:** - -* Use this software in a commercial product without a license from the original author; \ No newline at end of file diff --git a/README.md b/README.md index 6daca1b2..3af467f3 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,7 @@ -# WireGuard Easy +# WireUI -[![Build & Publish Docker Image to Docker Hub](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml/badge.svg?branch=production)](https://github.com/WeeJeWel/wg-easy/actions/workflows/deploy.yml) -[![Lint](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/WeeJeWel/wg-easy/actions/workflows/lint.yml) -[![Docker](https://img.shields.io/docker/v/weejewel/wg-easy/latest)](https://hub.docker.com/r/weejewel/wg-easy) -[![Docker](https://img.shields.io/docker/pulls/weejewel/wg-easy.svg)](https://hub.docker.com/r/weejewel/wg-easy) -[![Sponsor](https://img.shields.io/github/sponsors/weejewel)](https://github.com/sponsors/WeeJeWel) -![GitHub Stars](https://img.shields.io/github/stars/weejewel/wg-easy) -You have found the easiest way to install & manage WireGuard on any Linux host! +This is a security and hardening divergent fork of [wg-easy](https://github.com/Gyarbij/wireui) The easiest way to run [WireGuard](https://github.com/WireGuard). This takes care of the configurations steps for novices while still allowing customizability for more experienced users, and comes packed with a UI, so you're not fiddling with .conf files and scp.

@@ -27,13 +21,21 @@ You have found the easiest way to install & manage WireGuard on any Linux host! ## Requirements * A host with a kernel that supports WireGuard (all modern kernels). -* A host with Docker installed. +* A docker installation on the host. +* The ability to open a port in your router/FW. ## Installation ### 1. Install Docker -If you haven't installed Docker yet, install it by running: +If there is no present installation of Docker, you should install it using: +[Docker Desktop](https://docs.docker.com/get-docker/) for Desktop + +or + +[Docker Engine](https://docs.docker.com/engine/install/) for Servers/Headless + +Alternatively, you can install it by running the convenience script below. _The convenience script is not recommended for production environments, but can be used as an example to create a provisioning script that is tailored to your needs_: ```bash $ curl -sSL https://get.docker.com | sh @@ -43,16 +45,16 @@ $ exit And log in again. -### 2. Run WireGuard Easy +### 2. Run WireUI -To automatically install & run wg-easy, simply run: +To automatically install & run wireui, simply run: 

 $ docker run -d \
-  --name=wg-easy \
+  --name=wireui \
   -e WG_HOST=🚨YOUR_SERVER_IP \
   -e PASSWORD=🚨YOUR_ADMIN_PASSWORD \
-  -v ~/.wg-easy:/etc/wireguard \
+  -v ~/.wireui:/etc/wireguard \
   -p 51820:51820/udp \
   -p 51821:51821/tcp \
   --cap-add=NET_ADMIN \
@@ -60,7 +62,7 @@ $ docker run -d \
   --sysctl="net.ipv4.conf.all.src_valid_mark=1" \
   --sysctl="net.ipv4.ip_forward=1" \
   --restart unless-stopped \
-  weejewel/wg-easy
+  gyarbij/wireui
> 💡 Replace `YOUR_SERVER_IP` with your WAN IP, or a Dynamic DNS hostname. @@ -69,11 +71,8 @@ $ docker run -d \ The Web UI will now be available on `http://0.0.0.0:51821`. -> 💡 Your configuration files will be saved in `~/.wg-easy` - -### 3. Sponsor +> 💡 Your configuration files will be saved in `~/.wireui` -Are you enjoying this project? [Buy me a beer!](https://github.com/sponsors/WeeJeWel) 🍻 ## Options @@ -81,18 +80,18 @@ These options can be configured by setting environment variables using `-e KEY=" | Env | Default | Example | Description | | - | - | - | - | -| `PASSWORD` | - | `foobar123` | When set, requires a password when logging in to the Web UI. | -| `WG_HOST` | - | `vpn.myserver.com` | The public hostname of your VPN server. | +| `PASSWORD` | - | `ChangeMe@69` | When set, requires a password when logging in to the Web UI. | +| `WG_HOST` | - | `vpn.example.com` | The public hostname of your VPN server. | | `WG_PORT` | `51820` | `12345` | The public UDP port of your VPN server. WireGuard will always listen on `51820` inside the Docker container. | | `WG_MTU` | `null` | `1420` | The MTU the clients will use. Server uses default WG MTU. | -| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. If this value is 0, then connections won't be kept alive. | -| `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Clients IP address range. | +| `WG_PERSISTENT_KEEPALIVE` | `0` | `25` | Value in seconds to keep the "connection" open. | +| `WG_DEFAULT_ADDRESS` | `10.8.0.x` | `10.6.0.x` | Client's IP address range. | | `WG_DEFAULT_DNS` | `1.1.1.1` | `8.8.8.8, 8.8.4.4` | DNS server clients will use. | -| `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.168.15.0/24, 10.0.1.0/24` | Allowed IPs clients will use. | -| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L19) for the default value. | -| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L20) for the default value. | -| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L27) for the default value. | -| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/WeeJeWel/wg-easy/blob/master/src/config.js#L28) for the default value. | +| `WG_ALLOWED_IPS` | `0.0.0.0/0, ::/0` | `192.420.69.0/24, 10.0.1.0/24` | Allowed IPs clients will use. | +| `WG_PRE_UP` | `...` | - | See [config.js](https://github.com/Gyarbij/wireui/blob/master/src/config.js#L19) for the default value. | +| `WG_POST_UP` | `...` | `iptables ...` | See [config.js](https://github.com/Gyarbij/wireui/blob/master/src/config.js#L20) for the default value. | +| `WG_PRE_DOWN` | `...` | - | See [config.js](https://github.com/Gyarbij/wireui/blob/master/src/config.js#L27) for the default value. | +| `WG_POST_DOWN` | `...` | `iptables ...` | See [config.js](https://github.com/Gyarbij/wireui/blob/master/src/config.js#L28) for the default value. | > If you change `WG_PORT`, make sure to also change the exposed port. @@ -101,9 +100,9 @@ These options can be configured by setting environment variables using `-e KEY=" To update to the latest version, simply run: ```bash -docker stop wg-easy -docker rm wg-easy -docker pull weejewel/wg-easy +docker stop wireui +docker rm wireui +docker pull gyarbij/wireui ``` And then run the `docker run -d \ ...` command above again. diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..af06c88c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,12 @@ +# Security Policy + +## Supported Versions + +The only version supported is the current builds located at [Docker Hub](https://hub.docker.com/r/gyarbij/wireui/tags) + + +## Reporting a Vulnerability + +To report a vulnerability, email gyarbij@pm.me + +If it's something you can fix, please feel free to open a pull request. diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 65dfc570..e153132d 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -1,10 +1,10 @@ version: "3.8" services: wg-easy: - image: wg-easy + image: wireui command: npm run serve volumes: - ./src/:/app/ environment: # - PASSWORD=p - - WG_HOST=192.168.1.233 + - WG_HOST=dev.wireui.com diff --git a/docker-compose.yml b/docker-compose.yml index 9842b26f..92a582fa 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,25 +1,25 @@ version: "3.8" services: - wg-easy: + wireui: environment: # ⚠️ Required: # Change this to your host's public address - - WG_HOST=raspberrypi.local + - WG_HOST=vpn.wireui.com # Optional: - # - PASSWORD=foobar123 + # - PASSWORD=ChangeMe@69 # - WG_PORT=51820 # - WG_DEFAULT_ADDRESS=10.8.0.x # - WG_DEFAULT_DNS=1.1.1.1 # - WG_MTU=1420 - # - WG_ALLOWED_IPS=192.168.15.0/24, 10.0.1.0/24 + # - WG_ALLOWED_IPS=192.420.69.0/24, 10.0.1.0/24 # - WG_PRE_UP=echo "Pre Up" > /etc/wireguard/pre-up.txt # - WG_POST_UP=echo "Post Up" > /etc/wireguard/post-up.txt # - WG_PRE_DOWN=echo "Pre Down" > /etc/wireguard/pre-down.txt # - WG_POST_DOWN=echo "Post Down" > /etc/wireguard/post-down.txt - image: weejewel/wg-easy - container_name: wg-easy + image: gyarbij/wireui + container_name: wireui volumes: - .:/etc/wireguard ports: diff --git a/docs/changelog.json b/docs/changelog.json index feb49f89..05563ed4 100644 --- a/docs/changelog.json +++ b/docs/changelog.json @@ -1,9 +1,14 @@ -{ - "1": "Initial version. Enjoy!", - "2": "You can now rename a client, and update the address. Enjoy!", - "3": "Many improvements and small changes. Enjoy!", - "4": "Now with pretty charts for client's network speed. Enjoy!", - "5": "Many small improvements & feature requests. Enjoy!", - "6": "Many small performance improvements & bug fixes. Enjoy!", - "7": "Improved the look & performance of the upload/download chart." -} \ No newline at end of file + +# Changelog + +## v1.1.0-dev + +- Improved the look & performance of the upload/download chart. + +## v1.0.0 + +- Minify and syntax updates as well as UI changes. + +## v0.0.1 + +- Initial build \ No newline at end of file diff --git a/package.json b/package.json index cb2789c2..2d01f166 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "version": "1.0.0", "scripts": { - "build": "DOCKER_BUILDKIT=1 docker build --tag wg-easy .", + "build": "DOCKER_BUILDKIT=1 docker build --tag wireui .", "serve": "docker-compose -f docker-compose.yml -f docker-compose.dev.yml up", - "start": "docker run --env WG_HOST=0.0.0.0 --name wg-easy --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wg-easy" + "start": "docker run --env WG_HOST=0.0.0.0 --name wireui --cap-add=NET_ADMIN --cap-add=SYS_MODULE --sysctl=\"net.ipv4.conf.all.src_valid_mark=1\" --mount type=bind,source=\"$(pwd)\"/config,target=/etc/wireguard -p 51820:51820/udp -p 51821:51821/tcp wireui" } } \ No newline at end of file diff --git a/src/package-lock.json b/src/package-lock.json index 80dd23d3..47e4c169 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -1,5 +1,5 @@ { - "name": "wg-easy", + "name": "wireui", "version": "1.0.0", "lockfileVersion": 1, "requires": true, @@ -252,10 +252,9 @@ "dev": true }, "ansi-regex": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==" }, "ansi-styles": { "version": "3.2.1", @@ -504,11 +503,6 @@ "wrap-ansi": "^5.1.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -1704,9 +1698,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==", "dev": true }, "ms": { @@ -1895,9 +1889,9 @@ "dev": true }, "path-parse": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", - "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "dev": true }, "path-to-regexp": { @@ -2305,6 +2299,14 @@ "dev": true, "requires": { "ansi-regex": "^5.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + } } }, "strip-bom": { @@ -2523,11 +2525,6 @@ "strip-ansi": "^5.0.0" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", @@ -2592,11 +2589,6 @@ "yargs-parser": "^13.1.2" }, "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, "emoji-regex": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", diff --git a/src/package.json b/src/package.json index 8f4d4576..75998b30 100644 --- a/src/package.json +++ b/src/package.json @@ -1,6 +1,6 @@ { - "release": 7, - "name": "wg-easy", + "release": 1.1-dev, + "name": "wireui", "version": "1.0.0", "description": "", "main": "server.js", @@ -9,8 +9,8 @@ "serve-with-password": "PASSWORD=wg npm run serve", "lint": "eslint ." }, - "author": "Emile Nijssen", - "license": "GPL", + "author": "Gyarbij", + "license": "GNU Affero", "dependencies": { "debug": "^4.3.1", "express": "^4.17.1", @@ -28,6 +28,6 @@ ] }, "engines": { - "node": "14" + "node": "16" } } \ No newline at end of file diff --git a/src/www/img/favicon.ico b/src/www/img/favicon.ico new file mode 100644 index 00000000..defbd0de Binary files /dev/null and b/src/www/img/favicon.ico differ diff --git a/src/www/img/favicon.png b/src/www/img/favicon.png deleted file mode 100644 index 470e2e9b..00000000 Binary files a/src/www/img/favicon.png and /dev/null differ diff --git a/src/www/index.html b/src/www/index.html index 7d5da28d..6ca9ca99 100644 --- a/src/www/index.html +++ b/src/www/index.html @@ -2,7 +2,7 @@ - WireGuard + WireUI powered by WireGuard @@ -47,7 +47,7 @@

{{latestRelease.changelog}}

- Update → @@ -511,9 +511,8 @@

Made by Emile Nijssen · Donate · GitHub

+ href="https://gyarbij.gg/?ref=wireui">Gyarbij · GitHub

diff --git a/src/www/js/app.js b/src/www/js/app.js index e22cbfe0..9b396200 100644 --- a/src/www/js/app.js +++ b/src/www/js/app.js @@ -270,7 +270,7 @@ new Vue({ Promise.resolve().then(async () => { const currentRelease = await this.api.getRelease(); - const latestRelease = await fetch('https://weejewel.github.io/wg-easy/changelog.json') + const latestRelease = await fetch('https://gyarbij.github.io/wireui/changelog.json') .then(res => res.json()) .then(releases => { const releasesArray = Object.entries(releases).map(([version, changelog]) => ({ diff --git a/src/www/manifest.json b/src/www/manifest.json index 5214f3f3..67039edd 100644 --- a/src/www/manifest.json +++ b/src/www/manifest.json @@ -1,5 +1,5 @@ { - "name": "WireGuard", + "name": "WireUI powered by WireGuard", "display": "standalone", "background_color": "#fff", "icons": [