weyne/DCSOlympus
1
0
Fork 0
mirror of https://github.com/Pax1601/DCSOlympus.git synced 2025-10-29 16:56:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Default users can be used again

Browse Source
This commit is contained in:
Davide Passoni 2024-12-06 16:22:02 +01:00
parent 786729c006
commit b57d6b305a
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/react/src/ui/modals/loginmodal.tsx
View File

@ -29,8 +29,10 @@ export function LoginModal(props: { open: boolean }) {
const usernameCallback = useCallback(() => getApp()?.getServerManager().setUsername(username), [username]);
useEffect(usernameCallback, [username]);
var hash = sha256.create();
const passwordCallback = useCallback(() => getApp()?.getServerManager().setPassword(hash.update(password).hex()), [password]);
const passwordCallback = useCallback(() => {
var hash = sha256.create();
getApp()?.getServerManager().setPassword(hash.update(password).hex());
}, [password]);
useEffect(passwordCallback, [password]);
const login = useCallback(() => {

55
frontend/server/src/app.ts
View File

@ -22,21 +22,29 @@ function checkCustomHeaders(config, usersConfig, groupsConfig, req) {
) {
/* If so, check that the custom headers are indeed present */
if (
(config["frontend"]["customAuthHeaders"]["username"]).toLowerCase() in req.headers &&
(config["frontend"]["customAuthHeaders"]["group"]).toLowerCase() in req.headers
config["frontend"]["customAuthHeaders"]["username"].toLowerCase() in
req.headers &&
config["frontend"]["customAuthHeaders"]["group"].toLowerCase() in
req.headers
) {
/* If they are, assign the group */
group = req.headers[(config["frontend"]["customAuthHeaders"]["group"]).toLowerCase()];
group =
req.headers[
config["frontend"]["customAuthHeaders"]["group"].toLowerCase()
];
/* Check that the user is in an existing group */
if (group in groupsConfig) {
user = req.headers[(config["frontend"]["customAuthHeaders"]["username"]).toLowerCase()];
user =
req.headers[
config["frontend"]["customAuthHeaders"]["username"].toLowerCase()
];
usersConfig[user] = { password: null, roles: groupsConfig[group] };
}
}
}
return user
return user;
}
module.exports = function (configLocation, viteProxy) {
@ -117,19 +125,32 @@ module.exports = function (configLocation, viteProxy) {
app.use(logger("dev"));
/* Authorization middleware */
if ("customAuthHeaders" in config["frontend"] && config["frontend"]["customAuthHeaders"]["enabled"]) {
if (
"customAuthHeaders" in config["frontend"] &&
config["frontend"]["customAuthHeaders"]["enabled"]
) {
/* Custom authorization will be used */
app.use("/", async (req, res, next) => {
const user = checkCustomHeaders(config, usersConfig, groupsConfig, req);
if (user) {
/* If the user is preauthorized, set the authorization headers to the response */
res.set(config["frontend"]["customAuthHeaders"]["username"], req.headers[(config["frontend"]["customAuthHeaders"]["username"]).toLowerCase()])
res.set(config["frontend"]["customAuthHeaders"]["group"], req.headers[(config["frontend"]["customAuthHeaders"]["group"]).toLowerCase()])
res.set(
config["frontend"]["customAuthHeaders"]["username"],
req.headers[
config["frontend"]["customAuthHeaders"]["username"].toLowerCase()
]
);
res.set(
config["frontend"]["customAuthHeaders"]["group"],
req.headers[
config["frontend"]["customAuthHeaders"]["group"].toLowerCase()
]
);
}
next()
})
next();
});
} else {
/* Simple internal authorization will be used */
app.use("/olympus", auth);
@ -138,18 +159,20 @@ module.exports = function (configLocation, viteProxy) {
/* Define the middleware to replace the authorization header for the olympus backend */
app.use("/olympus", async (req, res, next) => {
/* Check if custom authorization headers are being used */
const user = req.auth?.user ?? checkCustomHeaders(config, usersConfig, groupsConfig, req);
const user =
req.auth?.user ??
checkCustomHeaders(config, usersConfig, groupsConfig, req);
/* If either simple authentication or custom authentication has succeded */
if (user) {
const userConfig = usersConfig[user];
/* Check that the user is authorized to at least one role */
if (userConfig.roles.length > 0) {
if (userConfig && userConfig.roles.length > 0) {
/* If a specific command role is requested, proceed with that role */
if (req.headers["x-command-mode"]) {
/* Check that the user is authorized to that role */
if (userConfig.roles.includes(req.headers["x-command-mode"]) ) {
if (userConfig.roles.includes(req.headers["x-command-mode"])) {
/* Check that the role is valid */
if (req.headers["x-command-mode"] in defaultUsers) {
/* Apply the authorization headers */
@ -175,11 +198,13 @@ module.exports = function (configLocation, viteProxy) {
}
}
} else {
res.sendStatus(401); // Unauthorized
if (!(user in defaultUsers)) res.sendStatus(401); // Unauthorized
}
/* Send back the roles that the user is enabled to */
res.set('X-Enabled-Command-Modes', `${userConfig.roles}`);
if (userConfig) res.set("X-Enabled-Command-Modes", `${userConfig.roles}`);
else if (user in defaultUsers)
res.set("X-Enabled-Command-Modes", `[${user}]`);
next();
} else {
res.sendStatus(401); // Unauthorized