adminforth 3.27.1 → 3.28.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../auth.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,4BAA4B,EAA2D,SAAS,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC7K,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../auth.ts"],"names":[],"mappings":"AAGA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,4BAA4B,EAA2D,SAAS,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC7K,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAgD9C,cAAM,cAAe,YAAW,eAAe;IAC7C,UAAU,EAAE,UAAU,CAAC;gBAEX,UAAU,KAAA;IAItB,WAAW,CAAC,OAAO,EAAE,MAAM;IAiC3B,gBAAgB,CAAC,QAAQ,KAAA;IAKnB,aAAa,CAAC,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,SAA+B,EAAE,KAAK,EAAE,EAAE;QACxG,gBAAgB,CAAC,EAAE,MAAM,CAAC;QAC1B,QAAQ,EAAE,GAAG,CAAC;QACd,QAAQ,EAAE,MAAM,CAAC;QACjB,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;QAClB,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,KAAK,CAAC,EAAE,SAAS,CAAA;KAClB,GAAG,OAAO,CAAC,MAAM,CAAC;IAmBnB,kBAAkB,CAAC,EAAC,QAAQ,EAAE,IAAI,EAAC;;;KAAA;IAKnC,eAAe,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE;QACrC,QAAQ,EAAE,GAAG,CAAC;QAAC,OAAO,EAAE;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAC;YAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;YAAC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;YAAC,QAAQ,EAAE,OAAO,CAAC;YAAC,YAAY,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;SAAE,CAAA;KAC/K;IAoBD,eAAe,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACjC,OAAO,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KACtD,GAAG,MAAM,GAAG,IAAI;IAKjB,aAAa,CAAC,OAAO,EAAE;QAAC,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,EAAE,GAAG,MAAM,GAAG,IAAI;IAS/D,0BAA0B,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,uBAAuB,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAiBpJ,kBAAkB,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QACrD,OAAO,EAAE;YAAC,GAAG,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,MAAM,CAAA;SAAC,EAAE,CAAC;QACxC,QAAQ,EAAE,uBAAuB,CAAC;QAClC,KAAK,EAAE,SAAS,CAAC;KAClB,GAAG,OAAO,CAAC,4BAA4B,CAAC;IAuBzC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,GAAG,MAAc,GAAG,MAAM;IAW7E,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,GAAE,OAAO,GAAG,SAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;WAsChG,oBAAoB,CAAC,QAAQ,KAAA;WAM7B,cAAc,CAAC,QAAQ,KAAA,EAAE,cAAc,KAAA;CAOrD;AAED,eAAe,cAAc,CAAC"}
|
package/dist/auth.js
CHANGED
|
@@ -2,7 +2,17 @@ import jwt from 'jsonwebtoken';
|
|
|
2
2
|
import crypto from 'crypto';
|
|
3
3
|
import { listify } from './modules/utils.js';
|
|
4
4
|
import { afLogger } from './modules/logger.js';
|
|
5
|
-
import
|
|
5
|
+
import { Address4, Address6 } from 'ip-address';
|
|
6
|
+
// Returns true for valid IPs which are not globally reachable (private, loopback, link-local, CGNAT, reserved, etc.)
|
|
7
|
+
function isIpPrivate(ip) {
|
|
8
|
+
if (Address4.isValid(ip)) {
|
|
9
|
+
return !new Address4(ip).isGlobal();
|
|
10
|
+
}
|
|
11
|
+
if (Address6.isValid(ip)) {
|
|
12
|
+
return !new Address6(ip).isGlobal();
|
|
13
|
+
}
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
6
16
|
// Function to generate a password hash using PBKDF2
|
|
7
17
|
function calcPasswordHash(password, salt, iterations = 100000, keyLength = 64, digest = 'sha512') {
|
|
8
18
|
return new Promise((resolve, reject) => {
|
|
@@ -64,8 +74,7 @@ class AdminForthAuth {
|
|
|
64
74
|
headersLower['x-host'] ||
|
|
65
75
|
null;
|
|
66
76
|
}
|
|
67
|
-
|
|
68
|
-
if (isIpPrivate) {
|
|
77
|
+
if (isIpPrivate(ip)) {
|
|
69
78
|
return null;
|
|
70
79
|
}
|
|
71
80
|
return ip;
|
package/dist/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../auth.ts"],"names":[],"mappings":"AACA,OAAO,GAAG,MAAM,cAAc,CAAC;AAC/B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAI5B,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,6 +51,7 @@ import dayjs from 'dayjs';
|
|
|
51
51
|
import utc from 'dayjs/plugin/utc';
|
|
52
52
|
|
|
53
53
|
import {useCoreStore} from '@/stores/core';
|
|
54
|
+
import {FLEXIBLE_DATEPICKER_FORMAT} from '@/utils';
|
|
54
55
|
|
|
55
56
|
import IconCalendar from "@/components/icons/IconCalendar.vue";
|
|
56
57
|
import IconTime from "@/components/icons/IconTime.vue";
|
|
@@ -138,7 +139,7 @@ watch(start, () => {
|
|
|
138
139
|
|
|
139
140
|
async function initDatepickers() {
|
|
140
141
|
const LS_LANG_KEY = `afLanguage`;
|
|
141
|
-
const options = {format:
|
|
142
|
+
const options = {format: FLEXIBLE_DATEPICKER_FORMAT, language: localStorage.getItem(LS_LANG_KEY)};
|
|
142
143
|
|
|
143
144
|
if (props.autoHide) {
|
|
144
145
|
options.autohide = true;
|
|
@@ -69,6 +69,7 @@ import dayjs from 'dayjs';
|
|
|
69
69
|
import utc from 'dayjs/plugin/utc';
|
|
70
70
|
|
|
71
71
|
import {useCoreStore} from '@/stores/core';
|
|
72
|
+
import {FLEXIBLE_DATEPICKER_FORMAT} from '@/utils';
|
|
72
73
|
|
|
73
74
|
import IconCalendar from "@/components/icons/IconCalendar.vue";
|
|
74
75
|
import IconTime from "@/components/icons/IconTime.vue";
|
|
@@ -213,8 +214,9 @@ async function initDatepickers() {
|
|
|
213
214
|
}
|
|
214
215
|
|
|
215
216
|
const LS_LANG_KEY = `afLanguage`;
|
|
216
|
-
|
|
217
|
-
|
|
217
|
+
const options = {format: FLEXIBLE_DATEPICKER_FORMAT, language: localStorage.getItem(LS_LANG_KEY)};
|
|
218
|
+
datepickerStartObject.value = new Datepicker(datepickerStartEl.value, options);
|
|
219
|
+
datepickerEndObject.value = new Datepicker(datepickerEndEl.value, options);
|
|
218
220
|
addChangeDateListener();
|
|
219
221
|
}
|
|
220
222
|
|
|
@@ -49,3 +49,109 @@ export function formatTime(time: string | null | undefined): string {
|
|
|
49
49
|
if (!time) return '';
|
|
50
50
|
return dayjs(`0000-00-00 ${time}`).format(getTimeFormat());
|
|
51
51
|
}
|
|
52
|
+
|
|
53
|
+
/** Locale shape flowbite-datepicker passes to custom format functions. */
|
|
54
|
+
type DatepickerLocale = { months: string[], monthsShort: string[] };
|
|
55
|
+
|
|
56
|
+
/** A run of letters or a run of digits, so "18Aug2003" and "Jun 23, 2022 ·" both tokenize cleanly. */
|
|
57
|
+
const DATE_TOKEN_RE = /\p{L}+|\p{N}+/gu;
|
|
58
|
+
/** Time (and timezone offset) part of a pasted datetime, dropped before tokenizing the date. */
|
|
59
|
+
const TIME_PART_RE = /\d{1,2}:\d{2}(:\d{2})?(\.\d+)?\s*([ap]\.?m\.?)?/gi;
|
|
60
|
+
/** A token consisting of digits only. */
|
|
61
|
+
const DIGITS_RE = /^\p{N}+$/u;
|
|
62
|
+
|
|
63
|
+
const EN_MONTHS = ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
|
|
64
|
+
const EN_MONTHS_SHORT = EN_MONTHS.map(m => m.slice(0, 3));
|
|
65
|
+
|
|
66
|
+
/** Two-digit years below this belong to the 2000s, the rest to the 1900s. */
|
|
67
|
+
const CENTURY_PIVOT = 50;
|
|
68
|
+
/** Shortest month abbreviation across locales; single letters would match random words. */
|
|
69
|
+
const MIN_MONTH_NAME_LENGTH = 2;
|
|
70
|
+
|
|
71
|
+
function findMonthIndex(name: string, locale: DatepickerLocale): number {
|
|
72
|
+
if (name.length < MIN_MONTH_NAME_LENGTH) {
|
|
73
|
+
return -1;
|
|
74
|
+
}
|
|
75
|
+
const lowered = name.toLowerCase();
|
|
76
|
+
const startsWithToken = (monthName: string) => monthName.toLowerCase().startsWith(lowered);
|
|
77
|
+
// both short and full names, in the active language and in English (pasted dates are often English)
|
|
78
|
+
for (const names of [locale.monthsShort, locale.months, EN_MONTHS_SHORT, EN_MONTHS]) {
|
|
79
|
+
const index = names.findIndex(startsWithToken);
|
|
80
|
+
if (index >= 0) {
|
|
81
|
+
return index;
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
return -1;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
function normalizeYear(year: number, digits: number): number {
|
|
88
|
+
if (digits > 2) {
|
|
89
|
+
return year;
|
|
90
|
+
}
|
|
91
|
+
return year < CENTURY_PIVOT ? 2000 + year : 1900 + year;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Parses a human-typed or pasted date in whatever order the parts came in:
|
|
96
|
+
* "18 Aug 2003", "Aug 18, 2003", "18.08.2003", "2003-08-18", "Jun 23, 2022 ·".
|
|
97
|
+
* Returns a local-midnight timestamp, or NaN when the string is not a date.
|
|
98
|
+
*/
|
|
99
|
+
export function parseFlexibleDate(dateStr: string, locale: DatepickerLocale): number {
|
|
100
|
+
const tokens = dateStr.replace(TIME_PART_RE, ' ').match(DATE_TOKEN_RE) || [];
|
|
101
|
+
|
|
102
|
+
let month = -1;
|
|
103
|
+
const numbers: { value: number, digits: number }[] = [];
|
|
104
|
+
for (const token of tokens) {
|
|
105
|
+
if (DIGITS_RE.test(token)) {
|
|
106
|
+
numbers.push({ value: parseInt(token, 10), digits: token.length });
|
|
107
|
+
} else if (month < 0) {
|
|
108
|
+
month = findMonthIndex(token, locale);
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
const yearIndex = numbers.findIndex(n => n.digits > 2);
|
|
113
|
+
const yearToken = yearIndex >= 0 ? numbers.splice(yearIndex, 1)[0] : undefined;
|
|
114
|
+
|
|
115
|
+
let day: number;
|
|
116
|
+
if (month >= 0) {
|
|
117
|
+
day = numbers.length ? numbers.shift()!.value : 1;
|
|
118
|
+
} else if (numbers.length >= 2) {
|
|
119
|
+
// year first means ISO-like order, otherwise day first (the format we render)
|
|
120
|
+
const [first, second] = yearIndex === 0 ? [numbers[1], numbers[0]] : numbers;
|
|
121
|
+
day = first.value;
|
|
122
|
+
month = second.value - 1;
|
|
123
|
+
numbers.splice(0, 2);
|
|
124
|
+
if (month > 11 && day <= 12) {
|
|
125
|
+
[day, month] = [month + 1, day - 1];
|
|
126
|
+
}
|
|
127
|
+
} else if (numbers.length === 1) {
|
|
128
|
+
day = numbers.shift()!.value;
|
|
129
|
+
month = new Date().getMonth();
|
|
130
|
+
} else {
|
|
131
|
+
return NaN;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
const leftover = numbers.shift();
|
|
135
|
+
const year = yearToken
|
|
136
|
+
? normalizeYear(yearToken.value, yearToken.digits)
|
|
137
|
+
: leftover
|
|
138
|
+
? normalizeYear(leftover.value, leftover.digits)
|
|
139
|
+
: new Date().getFullYear();
|
|
140
|
+
|
|
141
|
+
const date = new Date(year, month, day);
|
|
142
|
+
date.setFullYear(year);
|
|
143
|
+
// rejects impossible dates like "31 Feb" instead of silently rolling them over
|
|
144
|
+
return date.getMonth() === month && date.getDate() === day ? date.getTime() : NaN;
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
/**
|
|
148
|
+
* flowbite-datepicker format: renders as "18 Aug 2003" and accepts any parsable order on input.
|
|
149
|
+
*/
|
|
150
|
+
export const FLEXIBLE_DATEPICKER_FORMAT = {
|
|
151
|
+
toDisplay(date: Date, format: unknown, locale: DatepickerLocale): string {
|
|
152
|
+
return `${String(date.getDate()).padStart(2, '0')} ${locale.monthsShort[date.getMonth()]} ${date.getFullYear()}`;
|
|
153
|
+
},
|
|
154
|
+
toValue(dateStr: string, format: unknown, locale: DatepickerLocale): number {
|
|
155
|
+
return parseFlexibleDate(dateStr, locale);
|
|
156
|
+
},
|
|
157
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "adminforth",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.28.1",
|
|
4
4
|
"description": "OpenSource Agent-Native forth-generation admin panel",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"adminforth",
|
|
@@ -107,6 +107,7 @@
|
|
|
107
107
|
"fuse.js": "^7.0.0",
|
|
108
108
|
"handlebars": "^4.7.9",
|
|
109
109
|
"inquirer": "^12.3.0",
|
|
110
|
+
"ip-address": "^10.7.2",
|
|
110
111
|
"jiti": "^2.4.2",
|
|
111
112
|
"jsonwebtoken": "^9.0.2",
|
|
112
113
|
"listr2": "^8.2.5",
|
|
@@ -115,7 +116,6 @@
|
|
|
115
116
|
"p-limit": "^7.3.1",
|
|
116
117
|
"pino": "^10.1.0",
|
|
117
118
|
"pino-pretty": "^13.1.3",
|
|
118
|
-
"private-ip": "^3.0.2",
|
|
119
119
|
"rate-limiter-flexible": "^8.1.0",
|
|
120
120
|
"recast": "^0.23.11",
|
|
121
121
|
"sanitize-html": "2.17.4",
|