SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

working on permissions and messages

Browse Source
This commit is contained in:
Stephan Richter
2025-07-02 23:41:04 +02:00
parent 5100ac244a
commit caf2356f48
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/routes/user/Edit.svelte
View File

@@ -13,6 +13,7 @@
let options = $state([]); let options = $state([]);
let sent = $state(false); let sent = $state(false);
let caption = $state(t('user.save_user')); let caption = $state(t('user.save_user'));
let message = $state(t('user.loading_data'));
onMount(async () => { onMount(async () => {
let url = `${location.protocol}//${location.host.replace('5173','8080')}/themes.json`; let url = `${location.protocol}//${location.host.replace('5173','8080')}/themes.json`;
@@ -28,7 +29,12 @@
url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`; url = `${location.protocol}//${location.host.replace('5173','8080')}/api/user/${user_id}`;
resp = await fetch(url,{credentials:'include'}); resp = await fetch(url,{credentials:'include'});
if (resp.ok) editUser = await resp.json(); if (resp.ok) {
editUser = await resp.json();
} else {
message = await resp.text();
if (message == "") message = t(resp);
}
}); });
async function save(elem){ async function save(elem){
@@ -97,6 +103,6 @@
</table> </table>
<button onclick={save} disabled={sent}>{caption}</button> <button onclick={save} disabled={sent}>{caption}</button>
{:else} {:else}
{t('user.loading_data')} {message}
{/if} {/if}
</fieldset> </fieldset>

1
frontend/src/translations.svelte.js
View File

@@ -8,6 +8,7 @@ export async function loadTranslation(lang){
} }
export function t(key,...args){ export function t(key,...args){
if (key instanceof Response) key = 'status.'+key.status;
let set = translations.values; let set = translations.values;
let keys = key.split('.'); let keys = key.split('.');
for (let token of keys){ for (let token of keys){

3
translations/src/main/resources/de.json
View File

@@ -17,6 +17,9 @@
"users": "Benutzer", "users": "Benutzer",
"tutorial": "Tutorial" "tutorial": "Tutorial"
}, },
"status" : {
"403": "Zugriff verweigert"
},
"user" : { "user" : {
"actions": "Aktionen", "actions": "Aktionen",
"abort": "abbrechen", "abort": "abbrechen",

14
user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
View File

@@ -86,10 +86,10 @@ public class UserModule extends PathHandler {
}; };
try { try {
long userId = Long.parseLong(head); long userId = Long.parseLong(head);
if (userId == user.id() || (user instanceof DbUser dbUser && dbUser.permissions().contains(LIST_USERS))) { if (!(user instanceof DbUser dbUser && (user.id() == userId || dbUser.permissions().contains(LIST_USERS)))) {
var requestedUser = users.load(userId); return sendEmptyResponse(HTTP_FORBIDDEN,ex);
return sendContent(ex,requestedUser);
} }
return sendContent(ex,users.load(userId));
} catch (UmbrellaException e) { } catch (UmbrellaException e) {
return sendContent(ex,e.statusCode(),e.getMessage()); return sendContent(ex,e.statusCode(),e.getMessage());
} catch (NumberFormatException ignored) {} } catch (NumberFormatException ignored) {}
@@ -224,9 +224,7 @@ public class UserModule extends PathHandler {
if (!(requestingUser instanceof DbUser dbUser && dbUser.permissions().contains(PERMISSION.IMPERSONATE))) return sendEmptyResponse(HTTP_FORBIDDEN,ex); if (!(requestingUser instanceof DbUser dbUser && dbUser.permissions().contains(PERMISSION.IMPERSONATE))) return sendEmptyResponse(HTTP_FORBIDDEN,ex);
if (targetId == null) return sendContent(ex,HTTP_UNPROCESSABLE,"user id missing"); if (targetId == null) return sendContent(ex,HTTP_UNPROCESSABLE,"user id missing");
var targetUser = users.load(targetId); var targetUser = users.load(targetId);
users.getSession(targetUser) users.getSession(targetUser).cookie().addTo(ex);
.cookie()
.addTo(ex.getResponseHeaders());
return sendContent(ex,targetUser.toMap()); return sendContent(ex,targetUser.toMap());
} catch (UmbrellaException e) { } catch (UmbrellaException e) {
return sendContent(ex,e.statusCode(),e.getMessage()); return sendContent(ex,e.statusCode(),e.getMessage());
@@ -278,9 +276,7 @@ public class UserModule extends PathHandler {
var hashedPass = Password.of(BAD_HASHER.hash(password,null)); var hashedPass = Password.of(BAD_HASHER.hash(password,null));
try { try {
var user = users.load(username, hashedPass); var user = users.load(username, hashedPass);
users.getSession(user) users.getSession(user).cookie().addTo(ex);
.cookie()
.addTo(ex.getResponseHeaders());
return sendContent(ex,user); return sendContent(ex,user);
} catch (UmbrellaException ue){ } catch (UmbrellaException ue){
return sendContent(ex,ue.statusCode(),ue.getMessage()); return sendContent(ex,ue.statusCode(),ue.getMessage());