From b2370ce2568cea88adcc0b4909905df4be39b189 Mon Sep 17 00:00:00 2001 From: alex Date: Thu, 19 Nov 2020 10:45:50 +0800 Subject: [PATCH 1/3] 0.5.1 modify page permission to minimal permission, must allow to show --- build.gradle | 2 +- .../kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index cb4aa1a..46f25b9 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { subprojects { ext { - version '0.5.0' + version '0.5.1' gaea_version = '0.6.0' spring_version = "2.3.0.RELEASE" } diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt index 5e1fd92..d40c1c2 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PageQuery.kt @@ -31,7 +31,7 @@ class PageQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery, val permissions = this.permissionQuery.resourcePermissions(ResourceType.Page, role) return pages.filter { i -> val permission = permissions.find { p -> i.id == p.resource } - permission == null || permission.authority == PermissionType.Allow + permission != null && permission.authority == PermissionType.Allow } } @@ -44,4 +44,4 @@ class PageQuery(template: MongoTemplate, var permissionQuery: IPermissionQuery, this.clazz, this.collection(this.clazz)) ?: return null return this.authentication(page.id!!, role) } -} \ No newline at end of file +} From fd5b74d91760d050aa6d78515cad7271cd36adcb Mon Sep 17 00:00:00 2001 From: alex Date: Fri, 20 Nov 2020 16:56:14 +0800 Subject: [PATCH 2/3] modify permission type, default means not config it, null means not exist --- build.gradle | 2 +- .../src/main/kotlin/com/synebula/zeus/env/PermissionType.kt | 3 ++- .../synebula/zeus/query/contr/resouce/IPermissionQuery.kt | 4 ++-- .../com/synebula/zeus/query/impl/resouce/PermissionQuery.kt | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 46f25b9..500c393 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ allprojects { subprojects { ext { - version '0.5.1' + version '0.5.2' gaea_version = '0.6.0' spring_version = "2.3.0.RELEASE" } diff --git a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt index 1df9a95..845023d 100644 --- a/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt +++ b/src/zeus.env/src/main/kotlin/com/synebula/zeus/env/PermissionType.kt @@ -1,6 +1,7 @@ package com.synebula.zeus.env enum class PermissionType { + Default, Deny, Allow -} \ No newline at end of file +} diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt index 2b3d781..3e66d9a 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/contr/resouce/IPermissionQuery.kt @@ -9,5 +9,5 @@ interface IPermissionQuery : IQuery { fun resourcePermissions(resourceType: ResourceType, role: String): List - fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType? -} \ No newline at end of file + fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType +} diff --git a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt index 520a5d3..24f176b 100644 --- a/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt +++ b/src/zeus.query/src/main/kotlin/com/synebula/zeus/query/impl/resouce/PermissionQuery.kt @@ -21,13 +21,13 @@ class PermissionQuery(template: MongoTemplate) : MongoQuery(template), IPermissi ), this.clazz, this.collection) } - override fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType? { + override fun authentication(resourceType: ResourceType, resource: String, role: String): PermissionType { val permission = this.template.findOne( Query.query( Criteria.where("type").`is`(resourceType) .and("resource").`is`(resource) .and("role").`is`(role) ), this.clazz, this.collection) - return permission?.authority + return permission?.authority ?: PermissionType.Default } -} \ No newline at end of file +} From 37214dc0c658e83541bd5e1554a9d65de517293e Mon Sep 17 00:00:00 2001 From: alex Date: Sat, 5 Dec 2020 16:43:00 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E8=AE=A2GAEA=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 500c393..726eea1 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ allprojects { subprojects { ext { version '0.5.2' - gaea_version = '0.6.0' + gaea_version = '0.6.1' spring_version = "2.3.0.RELEASE" }