-
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index a4203365..71b10925 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -32,7 +32,8 @@
"port": "Port",
"yes": "Yes",
"no": "No",
- "confirmPassword": "Confirm Password"
+ "confirmPassword": "Confirm Password",
+ "loading": "Loading"
},
"setup": {
"welcome": "Welcome to your first setup of wg-easy",
@@ -147,7 +148,9 @@
"allowedIpsDesc": "Allowed IPs clients will use (global config)",
"dnsDesc": "DNS server clients will use (global config)",
"mtuDesc": "MTU clients will use (only for new clients)",
- "persistentKeepaliveDesc": "Interval in seconds to send keepalives to the server. 0 = disabled (only for new clients)"
+ "persistentKeepaliveDesc": "Interval in seconds to send keepalives to the server. 0 = disabled (only for new clients)",
+ "suggest": "Suggest",
+ "suggestDesc": "Choose a IP-Address or Hostname for the Host field"
},
"interface": {
"cidrSuccess": "Changed CIDR",
diff --git a/src/package.json b/src/package.json
index 5be4f552..2adb40e6 100644
--- a/src/package.json
+++ b/src/package.json
@@ -19,6 +19,7 @@
},
"dependencies": {
"@eschricht/nuxt-color-mode": "^1.1.5",
+ "@heroicons/vue": "^2.2.0",
"@libsql/client": "^0.14.0",
"@nuxtjs/i18n": "^9.3.1",
"@nuxtjs/tailwindcss": "^6.13.2",
@@ -60,5 +61,5 @@
"typescript": "^5.8.2",
"vue-tsc": "^2.2.8"
},
- "packageManager": "pnpm@10.6.2"
+ "packageManager": "pnpm@10.6.3"
}
diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml
index 15f73d72..37a6bf72 100644
--- a/src/pnpm-lock.yaml
+++ b/src/pnpm-lock.yaml
@@ -11,6 +11,9 @@ importers:
'@eschricht/nuxt-color-mode':
specifier: ^1.1.5
version: 1.1.5(magicast@0.3.5)
+ '@heroicons/vue':
+ specifier: ^2.2.0
+ version: 2.2.0(vue@3.5.13(typescript@5.8.2))
'@libsql/client':
specifier: ^0.14.0
version: 0.14.0
@@ -791,6 +794,11 @@ packages:
'@floating-ui/vue@1.1.6':
resolution: {integrity: sha512-XFlUzGHGv12zbgHNk5FN2mUB7ROul3oG2ENdTpWdE+qMFxyNxWSRmsoyhiEnpmabNm6WnUvR1OvJfUfN4ojC1A==}
+ '@heroicons/vue@2.2.0':
+ resolution: {integrity: sha512-G3dbSxoeEKqbi/DFalhRxJU4mTXJn7GwZ7ae8NuEQzd1bqdd0jAbdaBZlHPcvPD2xI1iGzNVB4k20Un2AguYPw==}
+ peerDependencies:
+ vue: '>= 3'
+
'@humanfs/core@0.19.1':
resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
engines: {node: '>=18.18.0'}
@@ -3403,7 +3411,6 @@ packages:
libsql@0.4.7:
resolution: {integrity: sha512-T9eIRCs6b0J1SHKYIvD8+KCJMcWZ900iZyxdnSCdqxN12Z1ijzT+jY5nrk72Jw4B0HGzms2NgpryArlJqvc3Lw==}
- cpu: [x64, arm64, wasm32]
os: [darwin, linux, win32]
lilconfig@3.1.3:
@@ -5761,6 +5768,10 @@ snapshots:
- '@vue/composition-api'
- vue
+ '@heroicons/vue@2.2.0(vue@3.5.13(typescript@5.8.2))':
+ dependencies:
+ vue: 3.5.13(typescript@5.8.2)
+
'@humanfs/core@0.19.1': {}
'@humanfs/node@0.16.6':
diff --git a/src/server/api/admin/ip-info.get.ts b/src/server/api/admin/ip-info.get.ts
new file mode 100644
index 00000000..1ea6d745
--- /dev/null
+++ b/src/server/api/admin/ip-info.get.ts
@@ -0,0 +1,4 @@
+export default definePermissionEventHandler('admin', 'any', async () => {
+ const result = await cachedGetIpInformation();
+ return result;
+});
diff --git a/src/server/api/setup/4.get.ts b/src/server/api/setup/4.get.ts
new file mode 100644
index 00000000..4c2a5186
--- /dev/null
+++ b/src/server/api/setup/4.get.ts
@@ -0,0 +1,4 @@
+export default defineSetupEventHandler(4, async () => {
+ const result = await cachedGetIpInformation();
+ return result;
+});
diff --git a/src/server/utils/cache.ts b/src/server/utils/cache.ts
new file mode 100644
index 00000000..96ea8c2d
--- /dev/null
+++ b/src/server/utils/cache.ts
@@ -0,0 +1,29 @@
+type Opts = {
+ /**
+ * Expiry time in milliseconds
+ */
+ expiry: number;
+};
+
+/**
+ * Cache function for 1 hour
+ */
+export function cacheFunction(fn: () => T, { expiry }: Opts): () => T {
+ let cache: { value: T; expiry: number } | null = null;
+
+ return (): T => {
+ const now = Date.now();
+
+ if (cache && cache.expiry > now) {
+ return cache.value;
+ }
+
+ const result = fn();
+ cache = {
+ value: result,
+ expiry: now + expiry,
+ };
+
+ return result;
+ };
+}
diff --git a/src/server/utils/ip.ts b/src/server/utils/ip.ts
index c5661337..c3c097e1 100644
--- a/src/server/utils/ip.ts
+++ b/src/server/utils/ip.ts
@@ -1,5 +1,7 @@
-import type { parseCidr } from 'cidr-tools';
+import { Resolver } from 'node:dns/promises';
+import { networkInterfaces } from 'node:os';
import { stringifyIp } from 'ip-bigint';
+import type { parseCidr } from 'cidr-tools';
import type { ClientNextIpType } from '#db/repositories/client/types';
@@ -31,3 +33,140 @@ export function nextIP(
return address;
}
+
+// use opendns to get public ip
+const dnsServers = {
+ ip4: ['208.67.222.222'],
+ ip6: ['2620:119:35::35'],
+ ip: 'myip.opendns.com',
+};
+
+async function getPublicInformation() {
+ const ipv4 = await getPublicIpv4();
+ const ipv6 = await getPublicIpv6();
+
+ const ptr4 = ipv4 ? await getReverseDns(ipv4) : [];
+ const ptr6 = ipv6 ? await getReverseDns(ipv6) : [];
+ const hostnames = [...new Set([...ptr4, ...ptr6])];
+
+ return { ipv4, ipv6, hostnames };
+}
+
+async function getPublicIpv4() {
+ try {
+ const resolver = new Resolver();
+ resolver.setServers(dnsServers.ip4);
+ const ipv4 = await resolver.resolve4(dnsServers.ip);
+ return ipv4[0];
+ } catch {
+ return null;
+ }
+}
+
+async function getPublicIpv6() {
+ try {
+ const resolver = new Resolver();
+ resolver.setServers(dnsServers.ip6);
+ const ipv6 = await resolver.resolve6(dnsServers.ip);
+ return ipv6[0];
+ } catch {
+ return null;
+ }
+}
+
+async function getReverseDns(ip: string) {
+ try {
+ const resolver = new Resolver();
+ resolver.setServers([...dnsServers.ip4, ...dnsServers.ip6]);
+ const ptr = await resolver.reverse(ip);
+ return ptr;
+ } catch {
+ return [];
+ }
+}
+
+function getPrivateInformation() {
+ const interfaces = networkInterfaces();
+
+ const interfaceNames = Object.keys(interfaces);
+
+ const obj: Record = {};
+
+ for (const name of interfaceNames) {
+ if (name === 'wg0') {
+ continue;
+ }
+
+ const iface = interfaces[name];
+ if (!iface) continue;
+
+ for (const { family, internal, address } of iface) {
+ if (internal) {
+ continue;
+ }
+ if (!obj[name]) {
+ obj[name] = {
+ ipv4: [],
+ ipv6: [],
+ };
+ }
+ if (family === 'IPv4') {
+ obj[name].ipv4.push(address);
+ } else if (family === 'IPv6') {
+ obj[name].ipv6.push(address);
+ }
+ }
+ }
+
+ return obj;
+}
+
+async function getIpInformation() {
+ const results = [];
+
+ const publicInfo = await getPublicInformation();
+ if (publicInfo.ipv4) {
+ results.push({
+ value: publicInfo.ipv4,
+ label: 'IPv4 - Public',
+ });
+ }
+ if (publicInfo.ipv6) {
+ results.push({
+ value: `[${publicInfo.ipv6}]`,
+ label: 'IPv6 - Public',
+ });
+ }
+ for (const hostname of publicInfo.hostnames) {
+ results.push({
+ value: hostname,
+ label: 'Hostname - Public',
+ });
+ }
+
+ const privateInfo = getPrivateInformation();
+ for (const [name, { ipv4, ipv6 }] of Object.entries(privateInfo)) {
+ for (const ip of ipv4) {
+ results.push({
+ value: ip,
+ label: `IPv4 - ${name}`,
+ });
+ }
+ for (const ip of ipv6) {
+ results.push({
+ value: `[${ip}]`,
+ label: `IPv6 - ${name}`,
+ });
+ }
+ }
+
+ return results;
+}
+
+/**
+ * Fetch IP Information
+ * @cache Response is cached for 15 min
+ */
+export const cachedGetIpInformation = cacheFunction(getIpInformation, {
+ expiry: 15 * 60 * 1000,
+});
diff --git a/src/server/utils/release.ts b/src/server/utils/release.ts
index 29fe762c..f5dfdc46 100644
--- a/src/server/utils/release.ts
+++ b/src/server/utils/release.ts
@@ -3,29 +3,6 @@ type GithubRelease = {
body: string;
};
-/**
- * Cache function for 1 hour
- */
-function cacheFunction(fn: () => T): () => T {
- let cache: { value: T; expiry: number } | null = null;
-
- return (): T => {
- const now = Date.now();
-
- if (cache && cache.expiry > now) {
- return cache.value;
- }
-
- const result = fn();
- cache = {
- value: result,
- expiry: now + 3600000,
- };
-
- return result;
- };
-}
-
async function fetchLatestRelease() {
try {
const response = await $fetch(
@@ -53,4 +30,6 @@ async function fetchLatestRelease() {
* Fetch latest release from GitHub
* @cache Response is cached for 1 hour
*/
-export const cachedFetchLatestRelease = cacheFunction(fetchLatestRelease);
+export const cachedFetchLatestRelease = cacheFunction(fetchLatestRelease, {
+ expiry: 60 * 60 * 1000,
+});
diff --git a/src/server/utils/session.ts b/src/server/utils/session.ts
index 9602ded5..1a144cea 100644
--- a/src/server/utils/session.ts
+++ b/src/server/utils/session.ts
@@ -91,6 +91,11 @@ export async function getCurrentUser(event: H3Event) {
});
}
user = foundUser;
+ } else {
+ throw createError({
+ statusCode: 401,
+ statusMessage: 'Session failed. No Authorization',
+ });
}
if (!user) {