deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2026-03-14 14:35:50 +01:00
Code Issues Projects Releases Wiki Activity

TypeScript and Vue 3 (#4559)

Browse source 
Co-authored-by: Eric Nemchik <eric@nemchik.com>
Co-authored-by: Pavel Djundik <xPaw@users.noreply.github.com>
This commit is contained in:
Max Leiter 2022-06-18 16:25:21 -08:00 • committed by GitHub
commit dd05ee3a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
349 changed files with 13388 additions and 8803 deletions
Download patch file Download diff file Expand all files Collapse all files

62
test/plugins/auth/ldap.js → test/plugins/auth/ldap.ts
View file

@ -1,12 +1,11 @@
"use strict";
const log = require("../../../src/log");
const ldapAuth = require("../../../src/plugins/auth/ldap");
const Config = require("../../../src/config");
const ldap = require("ldapjs");
const expect = require("chai").expect;
const stub = require("sinon").stub;
const TestUtil = require("../../util");
import log from "../../../server/log";
import ldapAuth from "../../../server/plugins/auth/ldap";
import Config from "../../../server/config";
import ldap from "ldapjs";
import {expect} from "chai";
import TestUtil from "../../util";
import ClientManager from "../../../server/clientManager";
import sinon from "ts-sinon";
const user = "johndoe";
const wrongUser = "eve";
@ -16,8 +15,8 @@ const baseDN = "ou=accounts,dc=example,dc=com";
const primaryKey = "uid";
const serverPort = 1389;
function normalizeDN(dn) {
return ldap.parseDN(dn).toString();
function normalizeDN(dn: string) {
return String(ldap.parseDN(dn).toString());
}
function startLdapServer(callback) {
@ -33,7 +32,7 @@ function startLdapServer(callback) {
authorizedUsers[normalizeDN(searchConf.rootDN)] = searchConf.rootPassword;
authorizedUsers[normalizeDN(userDN)] = correctPassword;
function authorize(req, res, next) {
function authorize(req: any, res: any, next: (error?: any) => void) {
const bindDN = req.connection.ldap.bindDN;
if (bindDN in authorizedUsers) {
@ -44,7 +43,7 @@ function startLdapServer(callback) {
}
Object.keys(authorizedUsers).forEach(function (dn) {
server.bind(dn, function (req, res, next) {
server.bind(dn, function (req, res, next: (error?: any) => void) {
const bindDN = req.dn.toString();
const password = req.credentials;
@ -86,11 +85,12 @@ function startLdapServer(callback) {
function testLdapAuth() {
// Create mock manager and client. When client is true, manager should not
// be used. But ideally the auth plugin should not use any of those.
const manager = {};
const manager = {} as ClientManager;
const client = true;
it("should successfully authenticate with correct password", function (done) {
ldapAuth.auth(manager, client, user, correctPassword, function (valid) {
// TODO: why is client = true?
ldapAuth.auth(manager, client as any, user, correctPassword, function (valid) {
expect(valid).to.equal(true);
done();
});
@ -98,26 +98,31 @@ function testLdapAuth() {
it("should fail to authenticate with incorrect password", function (done) {
let error = "";
stub(log, "error").callsFake(TestUtil.sanitizeLog((str) => (error += str)));
ldapAuth.auth(manager, client, user, wrongPassword, function (valid) {
const errorLogStub = sinon
.stub(log, "error")
.callsFake(TestUtil.sanitizeLog((str) => (error += str)));
ldapAuth.auth(manager, client as any, user, wrongPassword, function (valid) {
expect(valid).to.equal(false);
expect(error).to.equal(
"LDAP bind failed: InsufficientAccessRightsError: InsufficientAccessRightsError\n"
);
log.error.restore();
errorLogStub.restore();
done();
});
});
it("should fail to authenticate with incorrect username", function (done) {
let warning = "";
stub(log, "warn").callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
const warnLogStub = sinon
.stub(log, "warn")
.callsFake(TestUtil.sanitizeLog((str) => (warning += str)));
ldapAuth.auth(manager, client, wrongUser, correctPassword, function (valid) {
ldapAuth.auth(manager, client as any, wrongUser, correctPassword, function (valid) {
expect(valid).to.equal(false);
expect(warning).to.equal("LDAP Search did not find anything for: eve (0)\n");
log.warn.restore();
warnLogStub.restore();
done();
});
});
@ -128,24 +133,25 @@ describe("LDAP authentication plugin", function () {
this.timeout(TestUtil.isRunningOnCI() ? 25000 : 5000);
this.slow(300);
let server;
let server: ldap.Server;
let logInfoStub: sinon.SinonStub<string[], void>;
before(function (done) {
stub(log, "info");
logInfoStub = sinon.stub(log, "info");
server = startLdapServer(done);
});
after(function () {
server.close();
log.info.restore();
server.close(() => {
// no-op
});
logInfoStub.restore();
});
beforeEach(function () {
Config.values.public = false;
Config.values.ldap.enable = true;
Config.values.ldap.url = "ldap://localhost:" + String(serverPort);
Config.values.ldap.url = "ldap://127.0.0.1:" + String(serverPort);
Config.values.ldap.primaryKey = primaryKey;
});