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

implemented option to allow guests to see wiki page

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-09-19 23:03:37 +02:00
parent 60d116664b
commit 08eb382c85
6 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wiki/src/main/java/de/srsoftware/umbrella/wiki/SqliteDb.java
View File

@@ -278,11 +278,18 @@ public class SqliteDb extends BaseDb implements WikiDb {
if (page.isDirty(CONTENT) || page.isDirty(ID) || page.isDirty(TITLE)) insertInto(TABLE_PAGES,ID,VERSION,TITLE,CONTENT)
.values(page.id(),page.version(),page.title(),page.content()).execute(db).close();
if (page.isDirty(MEMBERS)){
Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.title())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID, equal(page.id())).where(USER_ID,Condition.notIn(page.members().keySet().toArray())).execute(db);
var query = replaceInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS);
for (var member : page.members().entrySet()) query.values(page.id(),member.getKey(),wikiPermissionCode(member.getValue().permission()));
query.execute(db).close();
}
if (page.isDirty(GUEST_ALLOWED)){
if (page.guestAllowed()) {
insertInto(TABLE_PAGES_USERS,PAGE_ID,USER_ID,PERMISSIONS).values(page.id(),0, wikiPermissionCode(READ_ONLY)).execute(db).close();
} else {
Query.delete().from(TABLE_PAGES_USERS).where(PAGE_ID,equal(page.id())).where(USER_ID,equal(0)).execute(db);
}
}
return page;
} catch (SQLException e) {
throw databaseException("Failed to write wiki page \"{0}\" to database",page.title(),e);

9
wiki/src/main/java/de/srsoftware/umbrella/wiki/WikiModule.java
View File

@@ -9,6 +9,7 @@ import static de.srsoftware.umbrella.core.Paths.*;
import static de.srsoftware.umbrella.core.Util.mapValues;
import static de.srsoftware.umbrella.core.exceptions.UmbrellaException.*;
import static de.srsoftware.umbrella.core.model.Permission.EDIT;
import static de.srsoftware.umbrella.core.model.Permission.READ_ONLY;
import static de.srsoftware.umbrella.wiki.Constants.*;
import com.sun.net.httpserver.HttpExchange;
@@ -148,8 +149,8 @@ public class WikiModule extends BaseHandler implements WikiService {
}
}
var page = loadPage(id,version);
var userId = user == null ? 0 : user.id();
var permission = page.members().get(userId);
if (page.guestAllowed()) return sendContent(ex,page);
var permission = page.members().get(user.id());
if (permission == null) throw forbidden("You are not allowed to access \"{0}\"!",id);
return sendContent(ex, page);
}
@@ -166,6 +167,10 @@ public class WikiModule extends BaseHandler implements WikiService {
for (var entry : members.entrySet()){
var userId = entry.getKey();
var permission = entry.getValue();
if (userId == 0){
if (permission == READ_ONLY) page.guestAllowed(true);
continue;
}
var user = users.get(userId);
pageMembers.put(userId,new Member(user,permission));
}