From d253bfaaa5f42b1fba71dc70de2932fbfdca5421 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 11 May 2020 18:29:06 +0200 Subject: Add other tests to external auth --- server/lib/oauth-model.ts | 2 +- .../peertube-plugin-test-external-auth-two/main.js | 48 ++++++++++++++++++++ server/tests/plugins/external-auth.ts | 52 +++++++++++++++++++--- 3 files changed, 96 insertions(+), 6 deletions(-) diff --git a/server/lib/oauth-model.ts b/server/lib/oauth-model.ts index dbcba897a..e5ea4636e 100644 --- a/server/lib/oauth-model.ts +++ b/server/lib/oauth-model.ts @@ -123,7 +123,7 @@ async function getUser (usernameOrEmail?: string, password?: string) { const user = await UserModel.loadByUsernameOrEmail(usernameOrEmail) // If we don't find the user, or if the user belongs to a plugin - if (!user || user.pluginAuth !== null) return null + if (!user || user.pluginAuth !== null || !password) return null const passwordMatch = await user.isPasswordMatch(password) if (passwordMatch !== true) return null diff --git a/server/tests/fixtures/peertube-plugin-test-external-auth-two/main.js b/server/tests/fixtures/peertube-plugin-test-external-auth-two/main.js index 126905ffc..1604a7c41 100644 --- a/server/tests/fixtures/peertube-plugin-test-external-auth-two/main.js +++ b/server/tests/fixtures/peertube-plugin-test-external-auth-two/main.js @@ -17,6 +17,54 @@ async function register ({ } }) } + + { + const result = registerExternalAuth({ + authName: 'external-auth-4', + authDisplayName: () => 'External Auth 4', + onAuthRequest: (req, res) => { + result.userAuthenticated({ + req, + res, + username: 'kefka2', + email: 'kefka@example.com', + displayName: 'Kefka duplication' + }) + } + }) + } + + { + const result = registerExternalAuth({ + authName: 'external-auth-5', + authDisplayName: () => 'External Auth 5', + onAuthRequest: (req, res) => { + result.userAuthenticated({ + req, + res, + username: 'kefka', + email: 'kefka@example.com', + displayName: 'Kefka duplication' + }) + } + }) + } + + { + const result = registerExternalAuth({ + authName: 'external-auth-6', + authDisplayName: () => 'External Auth 6', + onAuthRequest: (req, res) => { + result.userAuthenticated({ + req, + res, + username: 'existing_user', + email: 'existing_user@example.com', + displayName: 'Existing user' + }) + } + }) + } } async function unregister () { diff --git a/server/tests/plugins/external-auth.ts b/server/tests/plugins/external-auth.ts index 312561538..a85672782 100644 --- a/server/tests/plugins/external-auth.ts +++ b/server/tests/plugins/external-auth.ts @@ -18,7 +18,8 @@ import { updateMyUser, wait, userLogin, - updatePluginSettings + updatePluginSettings, + createUser } from '../../../shared/extra-utils' import { cleanupTests, flushAndRunServer, ServerInfo, waitUntilLog } from '../../../shared/extra-utils/server/servers' @@ -29,6 +30,7 @@ async function loginExternal (options: { username: string query?: any statusCodeExpected?: number + statusCodeExpectedStep2?: number }) { const res = await getExternalAuth({ url: options.server.url, @@ -47,7 +49,8 @@ async function loginExternal (options: { const resLogin = await loginUsingExternalToken( options.server, options.username, - externalAuthToken as string + externalAuthToken as string, + options.statusCodeExpectedStep2 ) return resLogin.body @@ -85,7 +88,7 @@ describe('Test external auth plugins', function () { const config: ServerConfig = res.body const auths = config.plugin.registeredExternalAuths - expect(auths).to.have.lengthOf(3) + expect(auths).to.have.lengthOf(6) const auth2 = auths.find((a) => a.authName === 'external-auth-2') expect(auth2).to.exist @@ -288,7 +291,7 @@ describe('Test external auth plugins', function () { const config: ServerConfig = res.body const auths = config.plugin.registeredExternalAuths - expect(auths).to.have.lengthOf(2) + expect(auths).to.have.lengthOf(5) const auth1 = auths.find(a => a.authName === 'external-auth-2') expect(auth1).to.not.exist @@ -311,6 +314,45 @@ describe('Test external auth plugins', function () { username: 'cyan', statusCodeExpected: 404 }) + + await userLogin(server, { username: 'cyan', password: null }, 400) + await userLogin(server, { username: 'cyan', password: '' }, 400) + await userLogin(server, { username: 'cyan', password: 'fake' }, 400) + }) + + it('Should not login kefka with another plugin', async function () { + await loginExternal({ + server, + npmName: 'test-external-auth-two', + authName: 'external-auth-4', + username: 'kefka2', + statusCodeExpectedStep2: 400 + }) + + await loginExternal({ + server, + npmName: 'test-external-auth-two', + authName: 'external-auth-4', + username: 'kefka', + statusCodeExpectedStep2: 400 + }) + }) + + it('Should not login an existing user', async function () { + await createUser({ + url: server.url, + accessToken: server.accessToken, + username: 'existing_user', + password: 'super_password' + }) + + await loginExternal({ + server, + npmName: 'test-external-auth-two', + authName: 'external-auth-6', + username: 'existing_user', + statusCodeExpectedStep2: 400 + }) }) it('Should display the correct configuration', async function () { @@ -319,7 +361,7 @@ describe('Test external auth plugins', function () { const config: ServerConfig = res.body const auths = config.plugin.registeredExternalAuths - expect(auths).to.have.lengthOf(1) + expect(auths).to.have.lengthOf(4) const auth2 = auths.find((a) => a.authName === 'external-auth-2') expect(auth2).to.not.exist -- cgit v1.2.3