From bc90883f1a5e9c4ecb76ae358734b85be515af7f Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 30 Apr 2020 15:03:09 +0200 Subject: Handle external login errors --- server/lib/auth.ts | 18 ++++++++---- server/lib/client-html.ts | 2 +- server/lib/plugins/register-helpers-store.ts | 4 +-- server/models/server/plugin.ts | 44 ++++++++++++++++++---------- 4 files changed, 44 insertions(+), 24 deletions(-) (limited to 'server') diff --git a/server/lib/auth.ts b/server/lib/auth.ts index 1fa896f6e..7c1dd1139 100644 --- a/server/lib/auth.ts +++ b/server/lib/auth.ts @@ -83,10 +83,13 @@ async function onExternalUserAuthenticated (options: { return } - if (!isAuthResultValid(npmName, authName, authResult)) return - const { res } = authResult + if (!isAuthResultValid(npmName, authName, authResult)) { + res.redirect('/login?externalAuthError=true') + return + } + logger.info('Generating auth bypass token for %s in auth %s of plugin %s.', authResult.username, authName, npmName) const bypassToken = await generateRandomString(32) @@ -238,24 +241,27 @@ function proxifyExternalAuthBypass (req: express.Request, res: express.Response) function isAuthResultValid (npmName: string, authName: string, result: RegisterServerAuthenticatedResult) { if (!isUserUsernameValid(result.username)) { - logger.error('Auth method %s of plugin %s did not provide a valid username.', authName, npmName, { result }) + logger.error('Auth method %s of plugin %s did not provide a valid username.', authName, npmName, { username: result.username }) return false } if (!result.email) { - logger.error('Auth method %s of plugin %s did not provide a valid email.', authName, npmName, { result }) + logger.error('Auth method %s of plugin %s did not provide a valid email.', authName, npmName, { email: result.email }) return false } // role is optional if (result.role && !isUserRoleValid(result.role)) { - logger.error('Auth method %s of plugin %s did not provide a valid role.', authName, npmName, { result }) + logger.error('Auth method %s of plugin %s did not provide a valid role.', authName, npmName, { role: result.role }) return false } // display name is optional if (result.displayName && !isUserDisplayNameValid(result.displayName)) { - logger.error('Auth method %s of plugin %s did not provide a valid display name.', authName, npmName, { result }) + logger.error( + 'Auth method %s of plugin %s did not provide a valid display name.', + authName, npmName, { displayName: result.displayName } + ) return false } diff --git a/server/lib/client-html.ts b/server/lib/client-html.ts index 572bd03bd..4a4b0d12f 100644 --- a/server/lib/client-html.ts +++ b/server/lib/client-html.ts @@ -119,7 +119,7 @@ export class ClientHtml { // Save locale in cookies res.cookie('clientLanguage', lang, { secure: WEBSERVER.SCHEME === 'https', - sameSite: true, + sameSite: 'none', maxAge: 1000 * 3600 * 24 * 90 // 3 months }) diff --git a/server/lib/plugins/register-helpers-store.ts b/server/lib/plugins/register-helpers-store.ts index a3ec7ef6a..e337b1cb0 100644 --- a/server/lib/plugins/register-helpers-store.ts +++ b/server/lib/plugins/register-helpers-store.ts @@ -230,9 +230,9 @@ export class RegisterHelpersStore { private buildSettingsManager (): PluginSettingsManager { return { - getSetting: (name: string) => PluginModel.getSetting(this.plugin.name, this.plugin.type, name), + getSetting: (name: string) => PluginModel.getSetting(this.plugin.name, this.plugin.type, name, this.settings), - getSettings: (names: string[]) => PluginModel.getSettings(this.plugin.name, this.plugin.type, names), + getSettings: (names: string[]) => PluginModel.getSettings(this.plugin.name, this.plugin.type, names, this.settings), setSetting: (name: string, value: string) => PluginModel.setSetting(this.plugin.name, this.plugin.type, name, value), diff --git a/server/models/server/plugin.ts b/server/models/server/plugin.ts index 83c873c5b..3f88ac26d 100644 --- a/server/models/server/plugin.ts +++ b/server/models/server/plugin.ts @@ -1,5 +1,10 @@ +import * as Bluebird from 'bluebird' +import { FindAndCountOptions, json } from 'sequelize' import { AllowNull, Column, CreatedAt, DataType, DefaultScope, Is, Model, Table, UpdatedAt } from 'sequelize-typescript' -import { getSort, throwIfNotValid } from '../utils' +import { MPlugin, MPluginFormattable } from '@server/typings/models' +import { PeerTubePlugin } from '../../../shared/models/plugins/peertube-plugin.model' +import { PluginType } from '../../../shared/models/plugins/plugin.type' +import { RegisterServerSettingOptions } from '../../../shared/models/plugins/register-server-setting.model' import { isPluginDescriptionValid, isPluginHomepage, @@ -7,12 +12,7 @@ import { isPluginTypeValid, isPluginVersionValid } from '../../helpers/custom-validators/plugins' -import { PluginType } from '../../../shared/models/plugins/plugin.type' -import { PeerTubePlugin } from '../../../shared/models/plugins/peertube-plugin.model' -import { FindAndCountOptions, json } from 'sequelize' -import { RegisterServerSettingOptions } from '../../../shared/models/plugins/register-server-setting.model' -import * as Bluebird from 'bluebird' -import { MPlugin, MPluginFormattable } from '@server/typings/models' +import { getSort, throwIfNotValid } from '../utils' @DefaultScope(() => ({ attributes: { @@ -112,7 +112,7 @@ export class PluginModel extends Model { return PluginModel.findOne(query) } - static getSetting (pluginName: string, pluginType: PluginType, settingName: string) { + static getSetting (pluginName: string, pluginType: PluginType, settingName: string, registeredSettings: RegisterServerSettingOptions[]) { const query = { attributes: [ 'settings' ], where: { @@ -123,13 +123,23 @@ export class PluginModel extends Model { return PluginModel.findOne(query) .then(p => { - if (!p || !p.settings) return undefined + if (!p || p.settings === undefined) { + const registered = registeredSettings.find(s => s.name === settingName) + if (!registered || registered.default === undefined) return undefined + + return registered.default + } return p.settings[settingName] }) } - static getSettings (pluginName: string, pluginType: PluginType, settingNames: string[]) { + static getSettings ( + pluginName: string, + pluginType: PluginType, + settingNames: string[], + registeredSettings: RegisterServerSettingOptions[] + ) { const query = { attributes: [ 'settings' ], where: { @@ -140,13 +150,17 @@ export class PluginModel extends Model { return PluginModel.findOne(query) .then(p => { - if (!p || !p.settings) return {} + const result: { [settingName: string ]: string | boolean } = {} - const result: { [settingName: string ]: string } = {} + for (const name of settingNames) { + if (!p || p.settings[name] === undefined) { + const registered = registeredSettings.find(s => s.name === name) - for (const key of Object.keys(p.settings)) { - if (settingNames.includes(key)) { - result[key] = p.settings[key] + if (registered?.default !== undefined) { + result[name] = registered.default + } + } else { + result[name] = p.settings[name] } } -- cgit v1.2.3