Weishen/Hydro
2
0 Fork 0
mirror of https://gitcode.com/gh_mirrors/hy/Hydro.git synced 2026-10-20 01:38:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

core: fix oauth redirect

Browse Source
This commit is contained in:
undefined committed 2022-09-20 02:23:56 +08:00
1 parent 10dd5d28d5
commit 92c62cb118
6 files changed
+67 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/hydrooj/package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "hydrooj", "name": "hydrooj",
"version": "3.17.9", "version": "3.17.10",
"bin": "bin/hydrooj.js", "bin": "bin/hydrooj.js",
"main": "src/loader", "main": "src/loader",
"module": "src/loader", "module": "src/loader",
packages/hydrooj/src/entry/cli.ts
+1 -1
View File
@@ -104,6 +104,6 @@ export async function load() {
require('../model/index'); require('../model/index');
await model(pending, fail); await model(pending, fail);
require('../script/index'); require('../script/index');
await script(pending, fail, []); await script(pending, fail);
await cli(); await cli();
} }
packages/hydrooj/src/entry/common.ts
+38 -82
View File
@@ -11,45 +11,57 @@ import * as bus from '../service/bus';
const logger = new Logger('common'); const logger = new Logger('common');
function getFiles(folder: string, base = ''): string[] { async function getFiles(folder: string, base = ''): Promise<string[]> {
const files = []; const files = [];
const f = fs.readdirSync(folder); const f = await fs.readdir(folder);
for (const i of f) { for (const i of f) {
if (fs.statSync(path.join(folder, i)).isDirectory()) { if ((await fs.stat(path.join(folder, i))).isDirectory()) {
files.push(...getFiles(path.join(folder, i), path.join(base, i))); files.push(...await getFiles(path.join(folder, i), path.join(base, i)));
} else files.push(path.join(base, i)); } else files.push(path.join(base, i));
} }
return files.map((item) => item.replace(/\\/gmi, '/')); return files.map((item) => item.replace(/\\/gmi, '/'));
} }
export async function handler(pending: string[], fail: string[]) { function locateFile(basePath: string, filenames: string[]) {
for (const i of filenames) {
const p = path.resolve(basePath, i);
if (fs.existsSync(p)) return p;
}
return null;
}
const getLoader = (type: string, filename: string) => async function loader(pending: string[], fail: string[]) {
for (const i of pending) { for (const i of pending) {
let p = path.resolve(i, 'handler.ts'); const p = locateFile(i, [`${filename}.ts`, `${filename}.js`]);
if (!fs.existsSync(p)) p = path.resolve(i, 'handler.js'); if (p && !fail.includes(i)) {
if (fs.existsSync(p) && !fail.includes(i)) {
try { try {
logger.info('Handler init: %s', i); logger.info(`${type.replace(/^(.)/, (t) => t.toUpperCase())} init: %s`, i);
require(p); require(p);
} catch (e) { } catch (e) {
fail.push(i); fail.push(i);
logger.error('Handler Load Fail: %s', i); logger.info(`${type.replace(/^(.)/, (t) => t.toUpperCase())} load fail: %s`, i);
logger.error(e); logger.error(e);
} }
} }
} }
await bus.serial('app/load/handler'); await bus.serial(`app/load/${type}`);
} };
export const handler = getLoader('handler', 'handler');
export const addon = getLoader('addon', 'index');
export const model = getLoader('model', 'model');
export const lib = getLoader('lib', 'lib');
export const script = getLoader('script', 'script');
export async function locale(pending: string[], fail: string[]) { export async function locale(pending: string[], fail: string[]) {
for (const i of pending) { await Promise.all(pending.map(async (i) => {
let p = path.resolve(i, 'locales'); const p = locateFile(i, ['locale', 'locales']);
if (!fs.existsSync(p)) p = path.resolve(i, 'locale'); if (p && (await fs.stat(p)).isDirectory() && !fail.includes(i)) {
if (fs.existsSync(p) && fs.statSync(p).isDirectory() && !fail.includes(i)) {
try { try {
const files = fs.readdirSync(p); const files = await fs.readdir(p);
const locales = {}; const locales = {};
for (const file of files) { for (const file of files) {
const content = fs.readFileSync(path.resolve(p, file)).toString(); const content = await fs.readFile(path.resolve(p, file), 'utf-8');
locales[file.split('.')[0]] = yaml.load(content); locales[file.split('.')[0]] = yaml.load(content);
} }
i18n(locales); i18n(locales);
@@ -60,7 +72,7 @@ export async function locale(pending: string[], fail: string[]) {
logger.error(e); logger.error(e);
} }
} }
} }));
await bus.serial('app/load/locale'); await bus.serial('app/load/locale');
} }
@@ -74,11 +86,12 @@ export async function setting(pending: string[], fail: string[], modelSetting: t
for (const i of pending) { for (const i of pending) {
let p = path.resolve(i, 'setting.yaml'); let p = path.resolve(i, 'setting.yaml');
const t = i.split(path.sep); const t = i.split(path.sep);
// TODO: change this name setting to package name
const name = t[t.length - 1]; const name = t[t.length - 1];
if (!fs.existsSync(p)) p = path.resolve(i, 'settings.yaml'); if (!fs.existsSync(p)) p = path.resolve(i, 'settings.yaml');
if (fs.existsSync(p) && !fail.includes(i)) { if (fs.existsSync(p) && !fail.includes(i)) {
try { try {
const cfg: any = yaml.load(fs.readFileSync(p, 'utf-8')); const cfg: any = yaml.load(await fs.readFile(p, 'utf-8'));
for (const key in cfg) { for (const key in cfg) {
let val = cfg[key].default || cfg[key].value; let val = cfg[key].default || cfg[key].value;
if (typeof val === 'string') { if (typeof val === 'string') {
@@ -106,11 +119,10 @@ export async function setting(pending: string[], fail: string[], modelSetting: t
export async function template(pending: string[], fail: string[]) { export async function template(pending: string[], fail: string[]) {
for (const i of pending) { for (const i of pending) {
let p = path.resolve(i, 'templates'); const p = locateFile(i, ['template', 'templates']);
if (!fs.existsSync(p)) p = path.resolve(i, 'template'); if (p && (await fs.stat(p)).isDirectory() && !fail.includes(i)) {
if (fs.existsSync(p) && fs.statSync(p).isDirectory() && !fail.includes(i)) {
try { try {
const files = getFiles(p); const files = await getFiles(p);
for (const file of files) { for (const file of files) {
if (file.endsWith('.tsx')) global.Hydro.ui.template[file] = require(path.resolve(p, file)); if (file.endsWith('.tsx')) global.Hydro.ui.template[file] = require(path.resolve(p, file));
global.Hydro.ui.template[file] = await fs.readFile(path.resolve(p, file), 'utf-8'); global.Hydro.ui.template[file] = await fs.readFile(path.resolve(p, file), 'utf-8');
@@ -126,47 +138,10 @@ export async function template(pending: string[], fail: string[]) {
await bus.serial('app/load/template'); await bus.serial('app/load/template');
} }
export async function model(pending: string[], fail: string[]) {
for (const i of pending) {
let p = path.resolve(i, 'model.ts');
if (!fs.existsSync(p)) p = path.resolve(i, 'model.js');
if (fs.existsSync(p) && !fail.includes(i)) {
try {
logger.info('Model init: %s', i);
require(p);
} catch (e) {
fail.push(i);
logger.error('Model Load Fail: %s', i);
logger.error(e);
}
}
}
await bus.serial('app/load/model');
}
export async function lib(pending: string[], fail: string[]) {
for (const i of pending) {
let p = path.resolve(i, 'lib.ts');
if (!fs.existsSync(p)) p = path.resolve(i, 'lib.js');
if (fs.existsSync(p) && !fail.includes(i)) {
try {
logger.info('Lib init: %s', i);
require(p);
} catch (e) {
fail.push(i);
logger.error('Lib Load Fail: %s', i);
logger.error(e);
}
}
}
await bus.serial('app/load/lib');
}
export async function service(pending: string[], fail: string[]) { export async function service(pending: string[], fail: string[]) {
for (const i of pending) { for (const i of pending) {
let p = path.resolve(i, 'service.ts'); const p = locateFile(i, ['service.ts', 'service.js']);
if (!fs.existsSync(p)) p = path.resolve(i, 'service.js'); if (p && !fail.includes(i)) {
if (fs.existsSync(p) && !fail.includes(i)) {
try { try {
logger.info('Service init: %s', i); logger.info('Service init: %s', i);
require(p); require(p);
@@ -184,22 +159,3 @@ export async function service(pending: string[], fail: string[]) {
} }
await bus.serial('app/load/service'); await bus.serial('app/load/service');
} }
export async function script(pending: string[], fail: string[], active: string[]) {
for (const i of pending) {
let p = path.resolve(i, 'script.ts');
if (!fs.existsSync(p)) p = path.resolve(i, 'script.js');
if (await fs.pathExists(p) && !fail.includes(i)) {
try {
logger.info('Script init: %s', i);
require(p);
} catch (e) {
fail.push(i);
logger.error('Script Load Fail: %s', i);
logger.error(e);
}
}
active.push(i);
}
await bus.serial('app/load/script');
}
packages/hydrooj/src/entry/worker.ts
+3 -4
View File
@@ -28,7 +28,6 @@ export async function load() {
} }
const pending = global.addons; const pending = global.addons;
const fail = []; const fail = [];
const active = [];
if (detail) logger.info('start'); if (detail) logger.info('start');
await Promise.all([ await Promise.all([
locale(pending, fail), locale(pending, fail),
@@ -73,7 +72,7 @@ export async function load() {
await notfound.apply(); await notfound.apply();
require('../script/index'); require('../script/index');
if (detail) logger.info('finish: script.builtin'); if (detail) logger.info('finish: script.builtin');
await script(pending, fail, active); await script(pending, fail);
if (detail) logger.info('finish: script.extra'); if (detail) logger.info('finish: script.extra');
await bus.serial('app/started'); await bus.serial('app/started');
if (detail) logger.info('finish: bus.serial(start)'); if (detail) logger.info('finish: bus.serial(start)');
@@ -98,6 +97,6 @@ export async function load() {
} }
} }
logger.success('Server started'); logger.success('Server started');
if (process.send) process.send('ready'); process.send?.('ready');
return { active, fail }; return { fail };
} }
packages/hydrooj/src/handler/user.ts
+2
View File
@@ -148,6 +148,7 @@ class UserLogoutHandler extends Handler {
async post() { async post() {
this.session.uid = 0; this.session.uid = 0;
this.session.scope = PERM.PERM_ALL.toString(); this.session.scope = PERM.PERM_ALL.toString();
this.response.redirect = '/';
} }
} }
@@ -379,6 +380,7 @@ class OauthCallbackHandler extends Handler {
await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip }); await user.setById(udoc._id, { loginat: new Date(), loginip: this.request.ip });
this.session.uid = udoc._id; this.session.uid = udoc._id;
this.session.scope = PERM.PERM_ALL.toString(); this.session.scope = PERM.PERM_ALL.toString();
this.response.redirect = '/';
return; return;
} }
} }
packages/hydrooj/src/loader.ts
+22 -24
View File
@@ -24,33 +24,31 @@ process.on('unhandledRejection', logger.error);
process.on('uncaughtException', logger.error); process.on('uncaughtException', logger.error);
export function addon(addonPath: string, prepend = false) { export function addon(addonPath: string, prepend = false) {
if (!(fs.existsSync(addonPath) && fs.statSync(addonPath).isFile())) { try {
try { // Is a npm package
// Is a npm package const packagejson = require.resolve(`${addonPath}/package.json`);
const packagejson = require.resolve(`${addonPath}/package.json`); // eslint-disable-next-line import/no-dynamic-require
// eslint-disable-next-line import/no-dynamic-require const payload = require(packagejson);
const payload = require(packagejson); const name = payload.name.startsWith('@hydrooj/') ? payload.name.split('@hydrooj/')[1] : payload.name;
const name = payload.name.startsWith('@hydrooj/') ? payload.name.split('@hydrooj/')[1] : payload.name; global.Hydro.version[name] = payload.version;
global.Hydro.version[name] = payload.version; const modulePath = path.dirname(packagejson);
const modulePath = path.dirname(packagejson); const publicPath = path.resolve(modulePath, 'public');
const publicPath = path.resolve(modulePath, 'public'); if (fs.existsSync(publicPath)) {
if (fs.existsSync(publicPath)) { global.publicDirs[prepend ? 'push' : 'unshift'](publicPath);
global.publicDirs[prepend ? 'push' : 'unshift'](publicPath); const targets = fs.readdirSync(publicPath);
const targets = fs.readdirSync(publicPath); for (const target of targets) {
for (const target of targets) { if (global.Hydro.ui.manifest[target] && !prepend) {
if (global.Hydro.ui.manifest[target] && !prepend) { global.Hydro.ui.manifest[target] = publicPath;
global.Hydro.ui.manifest[target] = publicPath; } else if (!global.Hydro.ui.manifest[target]) {
} else if (!global.Hydro.ui.manifest[target]) { global.Hydro.ui.manifest[target] = publicPath;
global.Hydro.ui.manifest[target] = publicPath;
}
} }
} }
global.addons[prepend ? 'unshift' : 'push'](modulePath);
} catch (e) {
logger.error(`Addon not found: ${addonPath}`);
logger.error(e);
} }
} else logger.error(`Addon not found: ${addonPath}`); global.addons[prepend ? 'unshift' : 'push'](modulePath);
} catch (e) {
logger.error(`Addon not found: ${addonPath}`);
logger.error(e);
}
} }
export function addScript(name: string, description: string) { export function addScript(name: string, description: string) {