Compare commits

...

6 commits

Author SHA1 Message Date
Mike Cao
9fbcec46af
Merge pull request #3737 from prince0xdev/fix/login-autocomplete-username
Some checks are pending
Node.js CI / build (postgresql, 18.18, 10) (push) Waiting to run
Create docker images (cloud) / Build, push, and deploy (push) Waiting to run
fix: correct autocomplete attributes to enable password manager autofill
2025-11-12 21:38:12 -08:00
Mike Cao
d98cc35208
Merge pull request #3743 from Mintimate/master
feat(geo): add redirect support for direct .mmdb downloads
2025-11-12 21:33:19 -08:00
Mintimate
e13362bfec feat(geo): add redirect support for direct .mmdb downloads 2025-11-12 19:18:44 +08:00
Mintimate
371ff47325 feat(geo): add support for direct .mmdb URL and custom GEO_DATABASE_URL
- Support GEO_DATABASE_URL environment variable for custom database URL

- Auto-detect .mmdb files and skip decompression

- Maintain backward compatibility with tar.gz archives
2025-11-12 17:51:19 +08:00
Prince EKPINSE
a56746ce6d fix: enable password manager autofill on login form (#3735) 2025-11-12 00:15:05 +01:00
Prince EKPINSE
678a2ccdf3 fix: correct autocomplete attributes to enable password manager autofill 2025-11-12 00:08:36 +01:00
2 changed files with 75 additions and 26 deletions

View file

@ -13,12 +13,18 @@ if (process.env.VERCEL && !process.env.BUILD_GEO) {
const db = 'GeoLite2-City';
let url = `https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/${db}.tar.gz`;
// Support custom URL via environment variable
let url = process.env.GEO_DATABASE_URL;
if (process.env.MAXMIND_LICENSE_KEY) {
url =
`https://download.maxmind.com/app/geoip_download` +
`?edition_id=${db}&license_key=${process.env.MAXMIND_LICENSE_KEY}&suffix=tar.gz`;
// Fallback to default URLs if not provided
if (!url) {
if (process.env.MAXMIND_LICENSE_KEY) {
url =
`https://download.maxmind.com/app/geoip_download` +
`?edition_id=${db}&license_key=${process.env.MAXMIND_LICENSE_KEY}&suffix=tar.gz`;
} else {
url = `https://raw.githubusercontent.com/GitSquared/node-geolite2-redist/master/redist/${db}.tar.gz`;
}
}
const dest = path.resolve(process.cwd(), 'geo');
@ -27,30 +33,72 @@ if (!fs.existsSync(dest)) {
fs.mkdirSync(dest);
}
const download = url =>
// Check if URL points to a direct .mmdb file (already extracted)
const isDirectMmdb = url.endsWith('.mmdb');
// Download handler for compressed tar.gz files
const downloadCompressed = url =>
new Promise(resolve => {
https.get(url, res => {
resolve(res.pipe(zlib.createGunzip({})).pipe(tar.t()));
});
});
download(url).then(
res =>
new Promise((resolve, reject) => {
res.on('entry', entry => {
if (entry.path.endsWith('.mmdb')) {
const filename = path.join(dest, path.basename(entry.path));
entry.pipe(fs.createWriteStream(filename));
console.log('Saved geo database:', filename);
}
});
res.on('error', e => {
reject(e);
});
res.on('finish', () => {
// Download handler for direct .mmdb files
const downloadDirect = (url, originalUrl) =>
new Promise((resolve, reject) => {
https.get(url, res => {
// Follow redirects
if (res.statusCode === 301 || res.statusCode === 302) {
downloadDirect(res.headers.location, originalUrl || url).then(resolve).catch(reject);
return;
}
const filename = path.join(dest, path.basename(originalUrl || url));
const fileStream = fs.createWriteStream(filename);
res.pipe(fileStream);
fileStream.on('finish', () => {
fileStream.close();
console.log('Saved geo database:', filename);
resolve();
});
}),
);
fileStream.on('error', e => {
reject(e);
});
});
});
// Execute download based on file type
if (isDirectMmdb) {
downloadDirect(url).catch(e => {
console.error('Failed to download geo database:', e);
process.exit(1);
});
} else {
downloadCompressed(url).then(
res =>
new Promise((resolve, reject) => {
res.on('entry', entry => {
if (entry.path.endsWith('.mmdb')) {
const filename = path.join(dest, path.basename(entry.path));
entry.pipe(fs.createWriteStream(filename));
console.log('Saved geo database:', filename);
}
});
res.on('error', e => {
reject(e);
});
res.on('finish', () => {
resolve();
});
}),
).catch(e => {
console.error('Failed to download geo database:', e);
process.exit(1);
});
}

View file

@ -44,15 +44,16 @@ export function LoginForm() {
name="username"
rules={{ required: formatMessage(labels.required) }}
>
<TextField autoComplete="off" />
<TextField autoComplete="username" />
</FormField>
<FormField
label={formatMessage(labels.password)}
data-test="input-password"
name="password"
rules={{ required: formatMessage(labels.required) }}
>
<PasswordField />
<PasswordField autoComplete="current-password" />
</FormField>
<FormButtons>
<FormSubmitButton