libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

Fixed api header authorization (#6399)

Browse source
This commit is contained in:
SamTV12345 2024-05-22 21:16:19 +02:00 committed by GitHub
parent 8cd2ed07ba
commit 63e9b2d4eb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4848 additions and 3834 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8677
pnpm-lock.yaml
View file

File diff suppressed because it is too large Load diff

3
src/node/handler/APIHandler.ts
View file

@ -153,6 +153,7 @@ type APIFields = {
api_key: string; api_key: string;
padID: string; padID: string;
padName: string; padName: string;
authorization: string;
} }
/** /**
@ -179,7 +180,7 @@ exports.handle = async function (apiVersion: string, functionName: string, field
} }
if (apikey !== null && apikey.trim().length > 0) { if (apikey !== null && apikey.trim().length > 0) {
fields.apikey = fields.apikey || fields.api_key; fields.apikey = fields.apikey || fields.api_key || fields.authorization;
// API key is configured, check if it is valid // API key is configured, check if it is valid
if (fields.apikey !== apikey!.trim()) { if (fields.apikey !== apikey!.trim()) {
throw new createHTTPError.Unauthorized('no or wrong API Key'); throw new createHTTPError.Unauthorized('no or wrong API Key');

1
src/node/utils/Settings.ts
View file

@ -756,7 +756,6 @@ const lookupEnvironmentVariables = (obj: MapArrayType<any>) => {
//console.log(root.collectFromLeafsUpwards()) //console.log(root.collectFromLeafsUpwards())
const rooting = root.collectFromLeafsUpwards() const rooting = root.collectFromLeafsUpwards()
console.log("Rooting is", rooting.ADMIN)
obj = Object.assign(obj, rooting) obj = Object.assign(obj, rooting)
return obj; return obj;
}; };

1
src/static/js/pluginfw/tsort.js
View file

@ -70,7 +70,6 @@ const tsortTest = () => {
]; ];
let sorted = tsort(edges); let sorted = tsort(edges);
console.log(sorted);
// example 2: failure ( A > B > C > A ) // example 2: failure ( A > B > C > A )
edges = [ edges = [