Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

Fixes and improvements

Smaug6739cd654b35ef73
diff --git a/backend/app/app.go b/backend/app/app.go
index e875e5a8..313d1e2f 100644
--- a/backend/app/app.go
+++ b/backend/app/app.go
@@ -31,11 +31,12 @@ type Config struct {
}
type Services struct {
- User services.UserService
- Session services.AuthService
- Log services.LogService
- Nodes services.NodeService
- Minio services.MinioService
+ User services.UserService
+ Session services.AuthService
+ Log services.LogService
+ Nodes services.NodeService
+ Permissions services.PermissionService
+ Minio services.MinioService
}
type App struct {
@@ -55,11 +56,12 @@ func InitApp(config Config) *App {
app.Snowflake = utils.NewSnowflake(1609459200000)
app.Config = config
app.Services = Services{
- User: services.NewUserService(app.DB),
- Session: services.NewAuthService(app.DB),
- Log: services.NewLogService(app.DB),
- Nodes: services.NewNodeService(app.DB),
- Minio: services.NewMinioService(app.MinioClient),
+ User: services.NewUserService(app.DB),
+ Session: services.NewAuthService(app.DB),
+ Log: services.NewLogService(app.DB),
+ Nodes: services.NewNodeService(app.DB),
+ Permissions: services.NewPermissionService(app.DB),
+ Minio: services.NewMinioService(app.MinioClient),
}
Migrate(&config)
diff --git a/backend/controllers/nodes.controller.go b/backend/controllers/nodes.controller.go
index 0bb3a04a..aeb2232c 100644
--- a/backend/controllers/nodes.controller.go
+++ b/backend/controllers/nodes.controller.go
@@ -12,6 +12,7 @@ import (
type NodeController interface {
GetPublicNode(c *gin.Context) (int, any)
+ GetSharedNodes(c *gin.Context) (int, any)
GetNodes(c *gin.Context) (int, any)
GetNode(c *gin.Context) (int, any)
CreateNode(c *gin.Context) (int, any)
@@ -46,6 +47,26 @@ func (ctr *Controller) GetPublicNode(c *gin.Context) (int, any) {
return http.StatusOK, node
}
+// Get shared nodes
+// @Summary Get all shared nodes
+// @Method GET
+// @Router /nodes/shared/:userId [get]
+// @Security Authenfification: Auth
+// @Success 200 {object} Success([]models.Node)
+// @Failure 400 {object} Error
+// @Failure 401 {object} Error
+func (ctr *Controller) GetSharedNodes(c *gin.Context) (int, any) {
+ id, err := utils.SelfOrPermission(c, utils.ADMINISTRATOR, "userId")
+ if err != nil {
+ return http.StatusUnauthorized, err
+ }
+ nodes, err := ctr.app.Services.Nodes.GetSharedNodes(id)
+ if err != nil {
+ return http.StatusInternalServerError, err
+ }
+ return http.StatusOK, nodes
+}
+
// Get nodes
// @Summary Get all nodes
// @Method GET
@@ -84,7 +105,7 @@ func (ctr *Controller) GetNode(c *gin.Context) (int, any) {
if err != nil {
return http.StatusInternalServerError, err
}
- err = utils.RessourceAccess(c, node.UserId)
+ err, _ = utils.RessourceAccess(c, node, ctr.app.Services.Permissions, 1)
if err != nil {
return http.StatusUnauthorized, err
}
@@ -155,7 +176,7 @@ func (ctr *Controller) UpdateNode(c *gin.Context) (int, any) {
if err != nil {
return http.StatusInternalServerError, err
}
- err = utils.RessourceAccess(c, db_node.UserId)
+ err, userIdContext := utils.RessourceAccess(c, db_node, ctr.app.Services.Permissions, 2)
if err != nil {
return http.StatusUnauthorized, err
}
@@ -163,8 +184,16 @@ func (ctr *Controller) UpdateNode(c *gin.Context) (int, any) {
if err := c.ShouldBind(node); err != nil {
return http.StatusBadRequest, err
}
+
+ if db_node.UserId != userIdContext {
+ // If the user is not the owner of the node, they cannot change the owner or the parent
+ node.ParentId = db_node.ParentId
+ node.UserId = db_node.UserId
+ }
node = &models.Node{
Id: nodeId,
+ ParentId: node.ParentId,
+ UserId: node.UserId,
Name: node.Name,
Description: node.Description,
Tags: node.Tags,
@@ -173,7 +202,6 @@ func (ctr *Controller) UpdateNode(c *gin.Context) (int, any) {
Theme: node.Theme,
Icon: node.Icon,
Color: node.Color,
- ParentId: node.ParentId,
Accessibility: node.Accessibility,
Display: node.Display,
Order: node.Order,
@@ -208,7 +236,7 @@ func (ctr *Controller) DeleteNode(c *gin.Context) (int, any) {
if err != nil {
return http.StatusInternalServerError, err
}
- err = utils.RessourceAccess(c, db_node.UserId)
+ err, _ = utils.RessourceAccess(c, db_node, ctr.app.Services.Permissions, 3)
if err != nil {
return http.StatusUnauthorized, err
}
diff --git a/backend/migrations/000010_nodes.up.sql b/backend/migrations/000010_nodes.up.sql
index 9e91310e..29ce1e51 100644
--- a/backend/migrations/000010_nodes.up.sql
+++ b/backend/migrations/000010_nodes.up.sql
@@ -25,7 +25,8 @@ CREATE TABLE `nodes` (
`created_timestamp` BIGINT NOT NULL,
`updated_timestamp` BIGINT NOT NULL,
CONSTRAINT `nodes_parent_fk` FOREIGN KEY (`parent_id`) REFERENCES `nodes` (`id`) ON DELETE CASCADE,
- CONSTRAINT `nodes_users_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE
+ CONSTRAINT `nodes_users_fk` FOREIGN KEY (`user_id`) REFERENCES `users` (`id`) ON DELETE CASCADE,
+ CONSTRAINT `chk_parent_not_self` CHECK (`parent_id` IS NULL OR `parent_id` != `id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
diff --git a/backend/router/routes/documents.go b/backend/router/routes/documents.go
deleted file mode 100644
index 2ed849ad..00000000
--- a/backend/router/routes/documents.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package routes
-
-import (
- "alexandrie/app"
- "alexandrie/controllers"
- "alexandrie/middlewares"
- "alexandrie/utils"
-
- "github.com/gin-gonic/gin"
-)
-
-func Nodes(app *app.App, router *gin.RouterGroup) {
- doc := router.Group("/nodes")
- docCtrl := controllers.NewNodeController(app)
-
- doc.GET("/public/:id", middlewares.Auth(), utils.WP(docCtrl.GetPublicNode))
- doc.GET("/:userId", middlewares.Auth(), utils.WP(docCtrl.GetNodes))
- doc.GET("/:userId/:id", middlewares.Auth(), utils.WP(docCtrl.GetNode))
- doc.POST("", middlewares.Auth(), utils.WP(docCtrl.CreateNode))
- doc.PUT("/:id", middlewares.Auth(), utils.WP(docCtrl.UpdateNode))
- doc.DELETE("/:id", middlewares.Auth(), utils.WP(docCtrl.DeleteNode))
-}
diff --git a/backend/router/routes/nodes.go b/backend/router/routes/nodes.go
new file mode 100644
index 00000000..d3bdd96c
--- /dev/null
+++ b/backend/router/routes/nodes.go
@@ -0,0 +1,23 @@
+package routes
+
+import (
+ "alexandrie/app"
+ "alexandrie/controllers"
+ "alexandrie/middlewares"
+ "alexandrie/utils"
+
+ "github.com/gin-gonic/gin"
+)
+
+func Nodes(app *app.App, router *gin.RouterGroup) {
+ node := router.Group("/nodes")
+ nodeCtrl := controllers.NewNodeController(app)
+
+ node.GET("/public/:id", middlewares.Auth(), utils.WP(nodeCtrl.GetPublicNode))
+ node.GET("/shared/:userId", middlewares.Auth(), utils.WP(nodeCtrl.GetSharedNodes))
+ node.GET("/:userId", middlewares.Auth(), utils.WP(nodeCtrl.GetNodes))
+ node.GET("/:userId/:id", middlewares.Auth(), utils.WP(nodeCtrl.GetNode))
+ node.POST("", middlewares.Auth(), utils.WP(nodeCtrl.CreateNode))
+ node.PUT("/:id", middlewares.Auth(), utils.WP(nodeCtrl.UpdateNode))
+ node.DELETE("/:id", middlewares.Auth(), utils.WP(nodeCtrl.DeleteNode))
+}
diff --git a/backend/services/node.service.go b/backend/services/node.service.go
index 742d507f..55be8995 100644
--- a/backend/services/node.service.go
+++ b/backend/services/node.service.go
@@ -8,6 +8,7 @@ import (
type NodeService interface {
GetAllNodes(userId types.Snowflake) ([]*models.Node, error)
+ GetSharedNodes(userId types.Snowflake) ([]*models.Node, error)
GetAllNodeBackup(user_id types.Snowflake) ([]*models.Node, error)
GetUserUploadsSize(userId types.Snowflake) (int64, error)
GetPublicNode(nodeId types.Snowflake) (*models.Node, error)
@@ -57,6 +58,58 @@ func (s *Service) GetAllNodes(userId types.Snowflake) ([]*models.Node, error) {
return nodes, nil
}
+func (s *Service) GetSharedNodes(userId types.Snowflake) ([]*models.Node, error) {
+ var nodes = make([]*models.Node, 0)
+
+ rows, err := s.db.Query(`
+ WITH RECURSIVE accessible_nodes AS (
+ -- 1. Directly accessible nodes
+ SELECT n.id, n.user_id, n.parent_id, n.name, n.description, n.tags, n.role, n.color, n.icon, n.theme, n.accessibility, n.display, n.order, n.size, n.metadata, n.created_timestamp, n.updated_timestamp
+ FROM nodes n
+ JOIN permissions p ON p.node_id = n.id
+ WHERE p.user_id = ?
+
+ UNION
+
+ -- 2. Child nodes of accessible nodes
+ SELECT c.id, c.user_id, c.parent_id, c.name, c.description, c.tags, c.role, c.color, c.icon, c.theme, c.accessibility, c.display, c.order, c.size, c.metadata, c.created_timestamp, c.updated_timestamp
+ FROM nodes c
+ JOIN accessible_nodes an ON an.id = c.parent_id)
+ SELECT * FROM accessible_nodes;
+ `, userId)
+ if err != nil {
+ return nil, err
+ }
+ defer rows.Close()
+
+ for rows.Next() {
+ var node models.Node
+ if err := rows.Scan(
+ &node.Id,
+ &node.UserId,
+ &node.ParentId,
+ &node.Name,
+ &node.Description,
+ &node.Tags,
+ &node.Role,
+ &node.Color,
+ &node.Icon,
+ &node.Theme,
+ &node.Accessibility,
+ &node.Display,
+ &node.Order,
+ &node.Size,
+ &node.Metadata,
+ &node.CreatedTimestamp,
+ &node.UpdatedTimestamp,
+ ); err != nil {
+ return nil, err
+ }
+ nodes = append(nodes, &node)
+ }
+
+ return nodes, nil
+}
func (s *Service) GetAllNodeBackup(user_id types.Snowflake) ([]*models.Node, error) {
var nodes = make([]*models.Node, 0)
rows, err := s.db.Query("SELECT `id`, `user_id`, `parent_id`, `name`, `description`, `tags`, `role`, `color`, `icon`, `thumbnail`, `theme`, `accessibility`, `display`, `order`, `content`, `content_compiled`, `size`, `metadata`, `created_timestamp`, `updated_timestamp` FROM nodes WHERE user_id = ?", user_id)
@@ -189,8 +242,9 @@ func (s *Service) CreateNode(node *models.Node) error {
}
func (s *Service) UpdateNode(node *models.Node) error {
- _, err := s.db.Exec("UPDATE nodes SET `parent_id` = ?, `name` = ?, `description` = ?, `tags` = ?, `role` = ?, `color` = ?, `icon` = ?, `thumbnail` = ?, `theme` = ?, `accessibility` = ?, `display` = ?, `order` = ?, `content` = ?, `content_compiled` = ?, `metadata` = ?, `updated_timestamp` = ? WHERE id = ?",
+ _, err := s.db.Exec("UPDATE nodes SET `parent_id` = ?, `user_id` = ?, `name` = ?, `description` = ?, `tags` = ?, `role` = ?, `color` = ?, `icon` = ?, `thumbnail` = ?, `theme` = ?, `accessibility` = ?, `display` = ?, `order` = ?, `content` = ?, `content_compiled` = ?, `metadata` = ?, `updated_timestamp` = ? WHERE id = ?",
node.ParentId,
+ node.UserId,
node.Name,
node.Description,
node.Tags,
diff --git a/backend/services/permissions.service.go b/backend/services/permissions.service.go
new file mode 100644
index 00000000..d6f82233
--- /dev/null
+++ b/backend/services/permissions.service.go
@@ -0,0 +1,53 @@
+package services
+
+import (
+ "alexandrie/types"
+ "database/sql"
+)
+
+type PermissionService interface {
+ HasPermission(userId, nodeId types.Snowflake, required int) bool
+ //GrantPermission(userId, nodeId types.Snowflake, permission int) error
+ //RevokePermission(userId, nodeId types.Snowflake) error
+}
+
+func NewPermissionService(db *sql.DB) PermissionService {
+ return &Service{db: db}
+}
+
+func (s *Service) HasPermission(userId, nodeId types.Snowflake, required int) bool {
+ var perm int
+ err := s.db.QueryRow(`
+ WITH RECURSIVE ancestors AS (
+ -- Start with the given node
+ SELECT id, parent_id
+ FROM nodes
+ WHERE id = ?
+
+ UNION ALL
+
+ -- Recursively find all ancestors
+ SELECT n.id, n.parent_id
+ FROM nodes n
+ INNER JOIN ancestors a ON a.parent_id = n.id
+ )
+ SELECT MAX(p.permission)
+ FROM permissions p
+ INNER JOIN ancestors an ON an.id = p.node_id
+ WHERE p.user_id = ?
+ `, nodeId, userId).Scan(&perm)
+
+ if err == sql.ErrNoRows {
+ return false
+ }
+ if err != nil {
+ return false
+ }
+
+ if perm == 0 {
+ return false
+ }
+
+ //fmt.Println("User", userId, "has inherited permission", perm, "on node", nodeId, "required:", required)
+ return perm >= required
+}
diff --git a/backend/utils/permissions.go b/backend/utils/permissions.go
index 899ad700..8d944ee7 100644
--- a/backend/utils/permissions.go
+++ b/backend/utils/permissions.go
@@ -1,6 +1,8 @@
package utils
import (
+ "alexandrie/models"
+ "alexandrie/services"
"alexandrie/types"
"errors"
"strconv"
@@ -89,21 +91,32 @@ func SelfOrPermission(ctx *gin.Context, allowed int, key ...string) (types.Snowf
return 0, errors.New("unauthorized")
}
-func RessourceAccess(ctx *gin.Context, targetId types.Snowflake) error {
- // Check if the connected user has access to the resource (userId == targetId) or if the user has the required permission (ADMINISTRATOR)
+func RessourceAccess(ctx *gin.Context, node *models.Node, permissionService services.PermissionService, permission int) (error, types.Snowflake) {
+ // Check if the connected user has access to the resource (userId == targetId) or if the user has the required permission (app ADMINISTRATOR or node permission)
+
+ // Check user is correctly authenticated
userId, err := GetUserIdCtx(ctx)
if err != nil {
- return err
+ return err, 0
}
- if userId == targetId {
- return nil
+ // Case 1: User is the owner of the resource
+ if userId == node.UserId {
+ return nil, userId
}
+ // Case 2: User is an app administrator
role, exists := ctx.Get("user_role")
if !exists {
- return errors.New("user role not found in context")
+ return errors.New("user role not found in context"), userId
}
if CheckPermission(role.(int), ADMINISTRATOR) {
- return nil
+ return nil, userId
+ }
+ // Case 3: User has the required permission on the resource
+ hasPermission := permissionService.HasPermission(userId, node.Id, permission)
+
+ if hasPermission {
+ return nil, userId
}
- return errors.New("unauthorized")
+
+ return errors.New("unauthorized"), userId
}
diff --git a/frontend/app/components/Sidebar/SidebarItem.vue b/frontend/app/components/Sidebar/SidebarItem.vue
index d101d216..49f06275 100644
--- a/frontend/app/components/Sidebar/SidebarItem.vue
+++ b/frontend/app/components/Sidebar/SidebarItem.vue
@@ -72,7 +72,7 @@ const drop = async (event: DragEvent) => {
if (draggedItem.role === -1) return; // Prevent dropping nav items
if (props.item.data.role === 4) return; // Prevent dropping on ressource items
-
+ if (draggedItem.id === props.item.id) return; // Prevent dropping on itself
// Move item to root
if (props.item.data.role === -1) {
return nodesStore.update({ ...draggedItem, parent_id: workspaceId.value });
diff --git a/frontend/app/composables/useSidebarTree.ts b/frontend/app/composables/useSidebarTree.ts
index 022ea262..c5881891 100644
--- a/frontend/app/composables/useSidebarTree.ts
+++ b/frontend/app/composables/useSidebarTree.ts
@@ -6,6 +6,7 @@ const preferencesStore = usePreferences();
const { workspaceId } = useSidebar();
let nodes: ComputedRef<Item<Node>[]> | Ref<Item<Node>[]> = ref([]);
+
const allItems = computed(() => nodes.value.filter(n => n.data.role !== 1));
const structure = computed(() => new TreeStructure(allItems.value));
@@ -69,7 +70,7 @@ function useSidebarTree() {
.sort((a, b) => (a.order ?? 0) - (b.order ?? 0) || a.name.localeCompare(b.name))
.map(node => ({
id: node.id,
- parent_id: node.parent_id || '',
+ parent_id: node.role !== 1 ? node.parent_id || '' : '',
label: node.name,
route: resolveLink(node),
icon: resolveIcon(node),
diff --git a/frontend/app/pages/dashboard.vue b/frontend/app/pages/dashboard.vue
index 50298d03..f0b565a0 100644
--- a/frontend/app/pages/dashboard.vue
+++ b/frontend/app/pages/dashboard.vue
@@ -15,5 +15,6 @@
<script setup lang="ts">
definePageMeta({ breadcrumb: 'Home' });
useNodesStore().fetch();
+useNodesStore().fetchShared();
useUserStore().fetch();
</script>
diff --git a/frontend/app/pages/dashboard/categories/[id]/edit.vue b/frontend/app/pages/dashboard/categories/[id]/edit.vue
index ab64a435..7d4dfab4 100644
--- a/frontend/app/pages/dashboard/categories/[id]/edit.vue
+++ b/frontend/app/pages/dashboard/categories/[id]/edit.vue
@@ -17,7 +17,12 @@
<div class="form-row">
<div class="form-column">
<label>Parent</label>
- <AppSelect v-model="category.parent_id" :items="categoriesItem" placeholder="Select a category parent" />
+ <AppSelect
+ v-model="category.parent_id"
+ :items="categoriesItem"
+ placeholder="Select a category parent"
+ :disabled="(i) => i.id == category!.id || nodesStore.hasDescendant(category!, (i as Item).id)"
+ />
</div>
<div class="form-column">
<label for="order">Order</label>
diff --git a/frontend/app/stores/db_strustures.d.ts b/frontend/app/stores/db_strustures.d.ts
index f62b470a..226ca824 100644
--- a/frontend/app/stores/db_strustures.d.ts
+++ b/frontend/app/stores/db_strustures.d.ts
@@ -49,6 +49,7 @@ export interface DB_Node {
export interface Node extends DB_Node {
partial?: boolean;
+ shared: boolean;
}
export interface User {
diff --git a/frontend/app/stores/documents.store.ts b/frontend/app/stores/documents.store.ts
index 6c72f7aa..3772c4a3 100644
--- a/frontend/app/stores/documents.store.ts
+++ b/frontend/app/stores/documents.store.ts
@@ -14,6 +14,7 @@ export const useNodesStore = defineStore('nodes', {
state: () => ({
nodes: [] as Array<Node | Node>,
public_nodes: [] as Node[],
+ shared_nodes: [] as Node[],
allTags: [] as string[],
isFetching: false,
}),
@@ -27,7 +28,19 @@ export const useNodesStore = defineStore('nodes', {
categories: state => state.nodes.filter(d => d.role === 1 || d.role === 2),
documents: state => state.nodes.filter(d => d.role === 3),
ressources: state => state.nodes.filter(d => d.role === 4),
-
+ hasDescendant:
+ state =>
+ (node: Node, descendantId: string): boolean => {
+ const checkDescendants = (currentNode: Node): boolean => {
+ const children = state.nodes.filter(d => d.parent_id === currentNode.id);
+ for (const child of children) {
+ if (child.id === descendantId) return true;
+ if (checkDescendants(child)) return true;
+ }
+ return false;
+ };
+ return checkDescendants(node);
+ },
getNext: state => (node?: Node) => {
const cnodes = state.nodes.filter(d => d.parent_id == node?.parent_id && d.role === 3);
const index = cnodes.findIndex(d => d.id == node?.id);
@@ -112,12 +125,12 @@ export const useNodesStore = defineStore('nodes', {
if (request.status == 'success') {
if (opts?.id) {
const index = this.nodes.findIndex(d => d.id == opts?.id);
- const updatedNode: Node = { ...(request.result as DB_Node), partial: false };
+ const updatedNode: Node = { ...(request.result as DB_Node), partial: false, shared: false };
if (index == -1) this.nodes.push(updatedNode);
else this.nodes[index] = updatedNode;
return updatedNode as 'id' extends keyof T ? Node : Node[];
} else {
- this.nodes = (request.result as DB_Node[]).map((d: DB_Node) => ({ ...d, partial: true }));
+ this.nodes.push(...(request.result as DB_Node[]).map((d: DB_Node) => ({ ...d, partial: true, shared: false })));
this.recomputeTags();
return this.nodes as 'id' extends keyof T ? Node : Node[];
}
@@ -129,15 +142,24 @@ export const useNodesStore = defineStore('nodes', {
if (existingDoc) return existingDoc;
const request = await makeRequest(`nodes/public/${id}`, 'GET', {});
if (request.status === 'success') {
- const fetchedDoc: Node = { ...(request.result as DB_Node), partial: false };
+ const fetchedDoc: Node = { ...(request.result as DB_Node), partial: false, shared: false };
this.public_nodes.push(fetchedDoc);
return fetchedDoc;
} else return undefined;
},
+ async fetchShared(): Promise<Node[]> {
+ console.log(`[store/nodes] Fetching shared nodes`);
+ if (this.nodes.length) return this.nodes;
+ const request = await makeRequest(`nodes/shared/@me`, 'GET', {});
+ if (request.status === 'success') {
+ this.nodes.push(...(request.result as DB_Node[]).map((d: DB_Node) => ({ ...d, partial: false, shared: true })));
+ return this.nodes;
+ } else throw request;
+ },
async post(node: Partial<Node>): Promise<DB_Node> {
const request = await makeRequest('nodes', 'POST', node);
if (request.status == 'success') {
- this.nodes.push({ ...(request.result as DB_Node), partial: false });
+ this.nodes.push({ ...(request.result as DB_Node), partial: false, shared: false });
return request.result as DB_Node;
} else throw request.message;
},