diff --git a/docker/README.md b/docker/README.md index 186c172f..34e3f573 100644 --- a/docker/README.md +++ b/docker/README.md @@ -121,6 +121,20 @@ Updating the WGDashboard container should be through 'The Docker Way' - by pulli --- +## 🧩 Custom Startup Scripts + +Every file placed in `/data/custom-init.d/` is executed with `bash` at container startup, in alphabetical order, right before WGDashboard starts. A failing script is logged but does not stop the container. + +This is useful for installing additional packages, for example `/data/custom-init.d/apk-add`: +```bash +apk update > /dev/null 2>&1 +apk add --no-cache util-linux openssh-client > /dev/null 2>&1 +``` + +> 📁 When using a Docker volume for `/data`, you can also bind-mount the directory directly, e.g. `./custom-init.d:/data/custom-init.d:ro`. + +--- + ## 🔐 Port Forwarding Note When using multiple WireGuard interfaces, remember to **open their respective ports** on the host. @@ -202,6 +216,7 @@ ENTRYPOINT ["/bin/bash", "/entrypoint.sh"] - **`ensure_installation`**: Sets up the app, database, and Python environment. - **`set_envvars`**: Writes `wg-dashboard.ini` and applies environment variables. +- **`run_custom_init`**: Runs user scripts from `/data/custom-init.d/`. - **`start_core`**: Starts the main WGDashboard service. - **`ensure_blocking`**: Tails the error log to keep the container process alive. diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index fe2d2dff..41eac98e 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -258,6 +258,24 @@ set_envvars() { done } +# Run user-provided drop-in scripts, e.g. to install additional packages +run_custom_init() { + local init_dir="/data/custom-init.d" + + [[ -d "$init_dir" ]] || return 0 + + printf "\n------------------ RUNNING CUSTOM SCRIPTS ------------------\n" + + for script in "$init_dir"/*; do + [[ -f "$script" ]] || continue + + echo "Running custom script: ${script}" + if ! bash "$script"; then + echo "Custom script ${script} exited with an error, continuing." + fi + done +} + # Start service and monitor logs start_and_monitor() { printf "\n---------------------- STARTING CORE -----------------------\n" @@ -331,4 +349,5 @@ start_and_monitor() { # Main execution flow ensure_installation set_envvars +run_custom_init start_and_monitor diff --git a/src/dashboard.py b/src/dashboard.py index a900056f..8e55150f 100644 --- a/src/dashboard.py +++ b/src/dashboard.py @@ -945,8 +945,17 @@ def API_addPeers(configName): allowed_ips: list[str] = data.get('allowed_ips', []) allowed_ips_validation: bool = data.get('allowed_ips_validation', True) - endpoint_allowed_ip: str = data.get('endpoint_allowed_ip', DashboardConfig.GetConfig("Peers", "peer_endpoint_allowed_ip")[1]) - dns_addresses: str = data.get('DNS', DashboardConfig.GetConfig("Peers", "peer_global_DNS")[1]) + config = WireguardConfigurations.get(configName) + overridePeerSettings = config.configurationInfo.OverridePeerSettings + + endpoint_allowed_ip: str = data.get('endpoint_allowed_ip', ( + overridePeerSettings.EndpointAllowedIPs + if overridePeerSettings.EndpointAllowedIPs else DashboardConfig.GetConfig("Peers", "peer_endpoint_allowed_ip")[1] + )) + dns_addresses: str = data.get('DNS', ( + overridePeerSettings.DNS + if overridePeerSettings.DNS else DashboardConfig.GetConfig("Peers", "peer_global_DNS")[1] + )) mtu: int = data.get('mtu', None) @@ -955,7 +964,10 @@ def API_addPeers(configName): preshared_key: str = data.get('preshared_key', "") if type(mtu) is not int or mtu < 0 or mtu > 1460: - default: str = DashboardConfig.GetConfig("Peers", "peer_mtu")[1] + default: str = ( + str(overridePeerSettings.MTU) + if overridePeerSettings.MTU else DashboardConfig.GetConfig("Peers", "peer_mtu")[1] + ) if default.isnumeric(): try: mtu = int(default) @@ -964,7 +976,10 @@ def API_addPeers(configName): else: mtu = 0 if type(keep_alive) is not int or keep_alive < 0: - default = DashboardConfig.GetConfig("Peers", "peer_keep_alive")[1] + default = ( + str(overridePeerSettings.PersistentKeepalive) + if overridePeerSettings.PersistentKeepalive else DashboardConfig.GetConfig("Peers", "peer_keep_alive")[1] + ) if default.isnumeric(): try: keep_alive = int(default) @@ -973,7 +988,6 @@ def API_addPeers(configName): else: keep_alive = 0 - config = WireguardConfigurations.get(configName) if not config.getStatus(): config.toggleConfiguration() ipStatus, availableIps = config.getAvailableIP(-1) @@ -1040,9 +1054,8 @@ def API_addPeers(configName): if ipStatus: for subnet in availableIps.keys(): for ip in availableIps[subnet]: - allowed_ips = [ip] + allowed_ips.append(ip) break - break else: return ResponseObject(False, "No more available IP can assign") @@ -1140,23 +1153,36 @@ def API_GetPeerHistoricalEndpoints(): if not configurationName or not id: return ResponseObject(False, "Please provide configurationName and id") fp, p = WireguardConfigurations.get(configurationName).searchPeer(id) - if fp: - result = p.getEndpoints() - geo = {} - try: - r = requests.post(f"http://ip-api.com/batch?fields=city,country,lat,lon,query", - data=json.dumps([x['endpoint'] for x in result])) - d = r.json() - - - except Exception as e: - return ResponseObject(data=result, message="Failed to request IP address geolocation. " + str(e)) - - return ResponseObject(data={ - "endpoints": p.getEndpoints(), - "geolocation": d - }) - return ResponseObject(False, "Peer does not exist") + if not fp: + return ResponseObject(False, "Peer does not exist") + endpoints = p.getEndpoints() + ips = [x['endpoint'] for x in endpoints] + unique_ips = list(set(ips)) + def chunks(lst, size=100): + for i in range(0, len(lst), size): + yield lst[i:i + size] + geo_cache = {} + try: + for batch in chunks(unique_ips, 100): + r = requests.post( + "http://ip-api.com/batch?fields=city,country,lat,lon,query", + data=json.dumps(batch), + timeout=5 + ) + r.raise_for_status() + data = r.json() + for item in data: + geo_cache[item["query"]] = item + geolocation = [geo_cache[ip] for ip in ips] + except Exception as e: + return ResponseObject( + data={"endpoints": endpoints}, + message="Failed to request IP address geolocation. " + str(e) + ) + return ResponseObject(data={ + "endpoints": endpoints, + "geolocation": geolocation + }) @app.get(f'{APP_PREFIX}/api/getPeerSessions') def API_GetPeerSessions(): diff --git a/src/modules/AmneziaConfiguration.py b/src/modules/AmneziaConfiguration.py index fde96e09..c5dcb672 100644 --- a/src/modules/AmneziaConfiguration.py +++ b/src/modules/AmneziaConfiguration.py @@ -37,6 +37,15 @@ class AmneziaConfiguration(WireguardConfiguration): self.I3 = "" self.I4 = "" self.I5 = "" + self.HeaderProtectionKey = "" + self.ContentPaddingAddition = 0 + self.RekeyAfterTime = 0 + self.RekeyTimeout = 0 + self.RejectAfterTime = 0 + self.KeepaliveTimeout = 0 + self.MaxHandshakeAttempts = 0 + self.RandomTrailers = 0 + self.DisableCookies = 0 self.J1 = "" self.J2 = "" self.J3 = "" @@ -84,6 +93,15 @@ class AmneziaConfiguration(WireguardConfiguration): "I3": self.I3, "I4": self.I4, "I5": self.I5, + "HeaderProtectionKey": self.HeaderProtectionKey, + "ContentPaddingAddition": self.ContentPaddingAddition, + "RekeyAfterTime": self.RekeyAfterTime, + "RekeyTimeout": self.RekeyTimeout, + "RejectAfterTime": self.RejectAfterTime, + "KeepaliveTimeout": self.KeepaliveTimeout, + "MaxHandshakeAttempts": self.MaxHandshakeAttempts, + "RandomTrailers": self.RandomTrailers, + "DisableCookies": self.DisableCookies, "J1": self.J1, "J2": self.J2, "J3": self.J3, @@ -152,7 +170,8 @@ class AmneziaConfiguration(WireguardConfiguration): f'{dbName}_history_endpoint', self.metadata, sqlalchemy.Column('id', sqlalchemy.String(255), nullable=False), sqlalchemy.Column('endpoint', sqlalchemy.String(255), nullable=False), - sqlalchemy.Column('time', time_col_type) + sqlalchemy.Column('time', time_col_type), + extend_existing=True ) self.infoTable = sqlalchemy.Table( diff --git a/src/modules/DashboardConfig.py b/src/modules/DashboardConfig.py index 4a4a30df..0accdf30 100644 --- a/src/modules/DashboardConfig.py +++ b/src/modules/DashboardConfig.py @@ -145,7 +145,9 @@ class DashboardConfig: for col_name, col_type in expected_columns.items(): if col_name not in existing_columns: - type_str = col_type().compile(dialect=self.engine.dialect) + type_str = ( + col_type if isinstance(col_type, db.types.TypeEngine) else col_type() + ).compile(dialect=self.engine.dialect) current_app.logger.info(f"Adding missing column '{col_name}' to table '{table_name}'") preparer = self.engine.dialect.identifier_preparer quoted_table = preparer.quote_identifier(table_name) diff --git a/src/modules/Peer.py b/src/modules/Peer.py index 68421f42..8ecf6d2f 100644 --- a/src/modules/Peer.py +++ b/src/modules/Peer.py @@ -207,6 +207,15 @@ class Peer: "I3": self.configuration.I3, "I4": self.configuration.I4, "I5": self.configuration.I5, + "HeaderProtectionKey": self.configuration.HeaderProtectionKey, + "ContentPaddingAddition": self.configuration.ContentPaddingAddition, + "RekeyAfterTime": self.configuration.RekeyAfterTime, + "RekeyTimeout": self.configuration.RekeyTimeout, + "RejectAfterTime": self.configuration.RejectAfterTime, + "KeepaliveTimeout": self.configuration.KeepaliveTimeout, + "MaxHandshakeAttempts": self.configuration.MaxHandshakeAttempts, + "RandomTrailers": self.configuration.RandomTrailers, + "DisableCookies": self.configuration.DisableCookies, "J1": self.configuration.J1, "J2": self.configuration.J2, "J3": self.configuration.J3, diff --git a/src/modules/WireguardConfiguration.py b/src/modules/WireguardConfiguration.py index a77b9d34..ced79abf 100644 --- a/src/modules/WireguardConfiguration.py +++ b/src/modules/WireguardConfiguration.py @@ -126,6 +126,15 @@ class WireguardConfiguration: "I3": self.I3, "I4": self.I4, "I5": self.I5, + "HeaderProtectionKey": self.HeaderProtectionKey, + "ContentPaddingAddition": self.ContentPaddingAddition, + "RekeyAfterTime": self.RekeyAfterTime, + "RekeyTimeout": self.RekeyTimeout, + "RejectAfterTime": self.RejectAfterTime, + "KeepaliveTimeout": self.KeepaliveTimeout, + "MaxHandshakeAttempts": self.MaxHandshakeAttempts, + "RandomTrailers": self.RandomTrailers, + "DisableCookies": self.DisableCookies, "J1": self.J1, "J2": self.J2, "J3": self.J3, @@ -240,7 +249,7 @@ class WireguardConfiguration: self.Status = self.getStatus() def __dropDatabase(self): - existingTables = [self.Name, f'{self.Name}_restrict_access', f'{self.Name}_transfer', f'{self.Name}_deleted'] + existingTables = [self.Name, f'{self.Name}_restrict_access', f'{self.Name}_transfer', f'{self.Name}_deleted', f'{self.Name}_history_endpoint'] try: with self.engine.begin() as conn: for name in existingTables: @@ -315,7 +324,8 @@ class WireguardConfiguration: f'{dbName}_history_endpoint', self.metadata, sqlalchemy.Column('id', sqlalchemy.String(255), nullable=False), sqlalchemy.Column('endpoint', sqlalchemy.String(255), nullable=False), - sqlalchemy.Column('time', time_col_type) + sqlalchemy.Column('time', time_col_type), + extend_existing=True ) self.infoTable = sqlalchemy.Table( @@ -949,8 +959,8 @@ class WireguardConfiguration: files.sort(key=lambda x: x[1], reverse=True) for f, ct in files: - if RegexMatch(rf"^({self.Name})_(\d+)\\.(conf)$", f): - s = re.search(rf"^({self.Name})_(\d+)\\.(conf)$", f) + if RegexMatch(rf"^({self.Name})_(\d+)\.(conf)$", f): + s = re.search(rf"^({self.Name})_(\d+)\.(conf)$", f) date = s.group(2) d = { "filename": f, @@ -991,7 +1001,11 @@ class WireguardConfiguration: if backupFileName not in backups: return False try: - os.remove(os.path.join(self.__getProtocolPath(), 'WGDashboard_Backup', backupFileName)) + backupPath = os.path.join(self.__getProtocolPath(), 'WGDashboard_Backup') + for ext in ('.conf', '.sql'): + f = os.path.join(backupPath, os.path.splitext(backupFileName)[0] + ext) + if os.path.exists(f): + os.remove(f) except Exception as e: return False return True @@ -1024,7 +1038,7 @@ class WireguardConfiguration: allowEdit = ["Address", "PreUp", "PostUp", "PreDown", "PostDown", "ListenPort", "Table"] awgKeys = [] if self.Protocol == 'awg': - awgKeys = ["Jc", "Jmin", "Jmax", "S1", "S2", "S3", "S4", "H1", "H2", "H3", "H4", "I1", "I2", "I3", "I4", "I5", "J1", "J2", "J3", "Itime"] + awgKeys = ["Jc", "Jmin", "Jmax", "S1", "S2", "S3", "S4", "H1", "H2", "H3", "H4", "I1", "I2", "I3", "I4", "I5", "HeaderProtectionKey", "ContentPaddingAddition", "RekeyAfterTime", "RekeyTimeout", "RejectAfterTime", "KeepaliveTimeout", "MaxHandshakeAttempts", "RandomTrailers", "DisableCookies", "J1", "J2", "J3", "Itime"] allowEdit += awgKeys start = original.index("[Interface]") try: @@ -1092,6 +1106,7 @@ class WireguardConfiguration: doRenameStatement("_restrict_access") doRenameStatement("_deleted") doRenameStatement("_transfer") + doRenameStatement("_history_endpoint") conn.execute( self.infoTable.update() .where(self.infoTable.c.ID == self.Name) diff --git a/src/requirements.txt b/src/requirements.txt index 4feeeb28..7569d046 100644 --- a/src/requirements.txt +++ b/src/requirements.txt @@ -14,4 +14,4 @@ psycopg[binary]==3.3.6 PyMySQL==1.2.3 tzlocal==5.4.5 python-jose[cryptography]==3.5.0 -pydantic==2.14.1 +pydantic==2.14.2 diff --git a/src/static/app/package-lock.json b/src/static/app/package-lock.json index acc88a46..7ee01148 100644 --- a/src/static/app/package-lock.json +++ b/src/static/app/package-lock.json @@ -9,7 +9,7 @@ "version": "4.3.4", "dependencies": { "@volar/language-server": "2.4.30", - "@vue/language-server": "3.3.13", + "@vue/language-server": "3.3.14", "@vuepic/vue-datepicker": "^14.0.0", "@vueuse/core": "^15.0.0", "@vueuse/shared": "^15.0.0", @@ -1132,12 +1132,12 @@ } }, "node_modules/@volar/language-core": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz", - "integrity": "sha512-w4qhIJ8ZSitgLAkVay6AbcnC7gP3glYM3fYwKV3srj8m494E3xtrCv6E+bWviiK/8hs6e6t1ij1s2Endql7vzQ==", + "version": "2.4.30", + "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.30.tgz", + "integrity": "sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==", "license": "MIT", "dependencies": { - "@volar/source-map": "2.4.28" + "@volar/source-map": "2.4.30" } }, "node_modules/@volar/language-server": { @@ -1165,16 +1165,7 @@ } } }, - "node_modules/@volar/language-server/node_modules/@volar/language-core": { - "version": "2.4.30", - "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.30.tgz", - "integrity": "sha512-73fjwEV8wat6aOZ6U/y/hqtE30ocrIWECg67b0txGczOMNw+MffLmvJ5fnFfN9drVUEYZzLdaNo6VAy6G6avMw==", - "license": "MIT", - "dependencies": { - "@volar/source-map": "2.4.30" - } - }, - "node_modules/@volar/language-server/node_modules/@volar/language-service": { + "node_modules/@volar/language-service": { "version": "2.4.30", "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.30.tgz", "integrity": "sha512-w/xDsASiqC71ggCOm7sTDXDNk/l72XEptodeRC68tgZ0e5QM4hM3zAqBGC7mBctvhrpYwKfMG+t9xcUo2hEFtA==", @@ -1194,13 +1185,13 @@ } } }, - "node_modules/@volar/language-server/node_modules/@volar/source-map": { + "node_modules/@volar/source-map": { "version": "2.4.30", "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.30.tgz", "integrity": "sha512-zym1ob/KwDDyN+0jGVtxwbxJSRRnUvv5HspCtz3yEfVVdCG4/dzxJktMGPAgemqRuVs81O0o/y0q3qOUErR8kg==", "license": "MIT" }, - "node_modules/@volar/language-server/node_modules/@volar/typescript": { + "node_modules/@volar/typescript": { "version": "2.4.30", "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.30.tgz", "integrity": "sha512-/DgA5tgYFPfrLFuSjIMXMGHk1LQv2+P8eny6+BhGNzFJELWIW7UZlc56ZLIRFhLsPpMfIFxM8/HvOPBggrjTZg==", @@ -1220,35 +1211,6 @@ } } }, - "node_modules/@volar/language-service": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.28.tgz", - "integrity": "sha512-Rh/wYCZJrI5vCwMk9xyw/Z+MsWxlJY1rmMZPsxUoJKfzIRjS/NF1NmnuEcrMbEVGja00aVpCsInJfixQTMdvLw==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.28", - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - } - }, - "node_modules/@volar/source-map": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz", - "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==", - "license": "MIT" - }, - "node_modules/@volar/typescript": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.28.tgz", - "integrity": "sha512-Ja6yvWrbis2QtN4ClAKreeUZPVYMARDYZl9LMEv1iQ1QdepB6wn0jTRxA9MftYmYa4DQ4k/DaSZpFPUfxl8giw==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.28", - "path-browserify": "^1.0.1", - "vscode-uri": "^3.0.8" - } - }, "node_modules/@vscode/emmet-helper": { "version": "2.11.0", "resolved": "https://registry.npmjs.org/@vscode/emmet-helper/-/emmet-helper-2.11.0.tgz", @@ -1373,12 +1335,12 @@ "license": "MIT" }, "node_modules/@vue/language-core": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.13.tgz", - "integrity": "sha512-axA0Xemn5LuUKuKWob0/kVq7xQ2mJJM6VqA9Exvt35nM9yRC31goWVve/G/Zb2ZCLsXC8FHYjjfXlnshknSCew==", + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.14.tgz", + "integrity": "sha512-kRB+3hHg0c+BdD1XLAvwjVMQd5pC05zijSlPDRI3ERvC/s04JlRs5upy2KjeMg/9m9oD5zuMVh9yVvkKfZqoJg==", "license": "MIT", "dependencies": { - "@volar/language-core": "2.4.28", + "@volar/language-core": "2.4.30", "@vue/compiler-dom": "^3.5.0", "@vue/shared": "^3.5.0", "alien-signals": "^3.2.1", @@ -1400,16 +1362,22 @@ "vscode-languageserver-textdocument": "^1.0.12" } }, + "node_modules/@vue/language-plugin-pug/node_modules/@volar/source-map": { + "version": "2.4.28", + "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.28.tgz", + "integrity": "sha512-yX2BDBqJkRXfKw8my8VarTyjv48QwxdJtvRgUpNE5erCsgEUdI2DsLbpa+rOQVAJYshY99szEcRDmyHbF10ggQ==", + "license": "MIT" + }, "node_modules/@vue/language-server": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/@vue/language-server/-/language-server-3.3.13.tgz", - "integrity": "sha512-6r7lkSxoG9KvppQIHifQ7b7SopFCLhnnRlyGjZxkf+pxiOhUhSQZ8Qzv9OXE9tu2BdIQ5Iaw+p/3Ho+QGHbppQ==", + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/@vue/language-server/-/language-server-3.3.14.tgz", + "integrity": "sha512-sB/Ie3mP8J+ua7ECipTPtiov7bOtpMtJVj3rEcrxpkns1MxQN5k6pL08oTOQHFS5Ol+U7cEzO6mOu2llASdRNA==", "license": "MIT", "dependencies": { - "@volar/language-server": "2.4.28", - "@vue/language-core": "3.3.13", - "@vue/language-service": "3.3.13", - "@vue/typescript-plugin": "3.3.13", + "@volar/language-server": "2.4.30", + "@vue/language-core": "3.3.14", + "@vue/language-service": "3.3.14", + "@vue/typescript-plugin": "3.3.14", "vscode-uri": "^3.1.0" }, "bin": { @@ -1419,31 +1387,14 @@ "typescript": "*" } }, - "node_modules/@vue/language-server/node_modules/@volar/language-server": { - "version": "2.4.28", - "resolved": "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.28.tgz", - "integrity": "sha512-NqcLnE5gERKuS4PUFwlhMxf6vqYo7hXtbMFbViXcbVkbZ905AIVWhnSo0ZNBC2V127H1/2zP7RvVOVnyITFfBw==", - "license": "MIT", - "dependencies": { - "@volar/language-core": "2.4.28", - "@volar/language-service": "2.4.28", - "@volar/typescript": "2.4.28", - "path-browserify": "^1.0.1", - "request-light": "^0.7.0", - "vscode-languageserver": "^9.0.1", - "vscode-languageserver-protocol": "^3.17.5", - "vscode-languageserver-textdocument": "^1.0.11", - "vscode-uri": "^3.0.8" - } - }, "node_modules/@vue/language-service": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-3.3.13.tgz", - "integrity": "sha512-HmRQz3bEZ0k8wfrydgPCNlnLxW4dHqATb01oQ4pr+tftHE6HxacknrAlzReIbPSZ4Y5d4r/s0AfpUnHtYoDZjA==", + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/@vue/language-service/-/language-service-3.3.14.tgz", + "integrity": "sha512-KJKIcuDJcLWpRTbm2N3Lc+Ri+/9mp7OnWwEBWJit7at8ultnYV09pvTTzh8rpDniEAoTIBt+Blli/b4n07HqDA==", "license": "MIT", "dependencies": { - "@volar/language-service": "2.4.28", - "@vue/language-core": "3.3.13", + "@volar/language-service": "2.4.30", + "@vue/language-core": "3.3.14", "@vue/shared": "^3.5.0", "path-browserify": "^1.0.1", "volar-service-css": "0.0.71", @@ -1506,16 +1457,16 @@ "license": "MIT" }, "node_modules/@vue/typescript-plugin": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-3.3.13.tgz", - "integrity": "sha512-L/ht0WIIB5GOPYx0ooWoVQztsI/v1h7lW2/ND0YBuoBYHTteGPfRFzM5j0/uD1nf/rYezqWHhNDDmww2Co53KA==", + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/@vue/typescript-plugin/-/typescript-plugin-3.3.14.tgz", + "integrity": "sha512-+PUukA0VmMDWqNcuGEhoW6aoc1vgMHGkOMVVdYjgDV1jdJJPqqMIPHy23GHM1Lb+VHZqiGIrchvhqg6kDjQpqw==", "license": "MIT", "dependencies": { - "@volar/typescript": "2.4.28", - "@vue/language-core": "3.3.13", + "@volar/typescript": "2.4.30", + "@vue/language-core": "3.3.14", "@vue/shared": "^3.5.0", "path-browserify": "^1.0.1", - "vue-component-meta": "3.3.13" + "vue-component-meta": "3.3.14" } }, "node_modules/@vuepic/vue-datepicker": { @@ -7882,13 +7833,13 @@ } }, "node_modules/vue-component-meta": { - "version": "3.3.13", - "resolved": "https://registry.npmjs.org/vue-component-meta/-/vue-component-meta-3.3.13.tgz", - "integrity": "sha512-VnqcGTxB4n56qWfsuroOL+cEvjkV8uEffGy57bqlzePAQKQMLBXAjIKIntyngunmMnxWHMLzkYgRxdx9I1H/hg==", + "version": "3.3.14", + "resolved": "https://registry.npmjs.org/vue-component-meta/-/vue-component-meta-3.3.14.tgz", + "integrity": "sha512-OQT0AVGbFjmo/aIsyrNN8M3zR3D7U3SNyQPzVlotl89dxIdhhy95wYALiiFrHkBWyvTLRxMRQ3cqkbOMHEh8DQ==", "license": "MIT", "dependencies": { - "@volar/typescript": "2.4.28", - "@vue/language-core": "3.3.13", + "@volar/typescript": "2.4.30", + "@vue/language-core": "3.3.14", "path-browserify": "^1.0.1" }, "peerDependencies": { diff --git a/src/static/app/package.json b/src/static/app/package.json index 195dce6f..934d7a8d 100644 --- a/src/static/app/package.json +++ b/src/static/app/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@volar/language-server": "2.4.30", - "@vue/language-server": "3.3.13", + "@vue/language-server": "3.3.14", "@vuepic/vue-datepicker": "^14.0.0", "@vueuse/core": "^15.0.0", "@vueuse/shared": "^15.0.0", diff --git a/src/static/app/src/components/configurationComponents/editConfiguration.vue b/src/static/app/src/components/configurationComponents/editConfiguration.vue index f5d67dc4..bca8e775 100644 --- a/src/static/app/src/components/configurationComponents/editConfiguration.vue +++ b/src/static/app/src/components/configurationComponents/editConfiguration.vue @@ -197,7 +197,7 @@ const deleteConfigurationModal = ref(false) v-model="data[key]" :id="'configuration_' + key"> -