kylin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shaofeng...@apache.org
Subject [1/2] kylin git commit: KYLIN-1219 fix conflict url pattern in kylinSecurity.xml configuration
Date Tue, 19 Jan 2016 01:58:31 GMT
Repository: kylin
Updated Branches:
  refs/heads/2.x-staging 7b210fc41 -> 573c84e61


KYLIN-1219 fix conflict url pattern in kylinSecurity.xml configuration


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/4c2e57ed
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/4c2e57ed
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/4c2e57ed

Branch: refs/heads/2.x-staging
Commit: 4c2e57edc50eb0b71881ada5d1ebc5c81e8e3657
Parents: 7b210fc
Author: shaofengshi <shaofengshi@apache.org>
Authored: Tue Jan 19 09:50:19 2016 +0800
Committer: shaofengshi <shaofengshi@apache.org>
Committed: Tue Jan 19 09:57:35 2016 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/kylin/rest/service/AdminService.java | 1 +
 server/src/main/resources/kylinSecurity.xml                       | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/4c2e57ed/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
index 0541ba3..1a9ae95 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/AdminService.java
@@ -96,6 +96,7 @@ public class AdminService extends BasicService {
         }
     }
 
+    @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
     public void cleanupStorage() {
         StorageCleanupJob job = new StorageCleanupJob();
         String[] args = new String[] { "-delete", "true" };

http://git-wip-us.apache.org/repos/asf/kylin/blob/4c2e57ed/server/src/main/resources/kylinSecurity.xml
----------------------------------------------------------------------
diff --git a/server/src/main/resources/kylinSecurity.xml b/server/src/main/resources/kylinSecurity.xml
index f9884c7..4a9b929 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -176,9 +176,6 @@
 		<scr:http security="none" pattern="/js/**"/>
 		<scr:http security="none" pattern="/login/**"/>
 		<scr:http security="none" pattern="/routes.json"/>
-		<scr:http security="none" pattern="/api/projects" />
-		<scr:http security="none" pattern="/api/admin/config" />
-		<scr:http security="none" pattern="/api/admin/env" />
 
 		<!-- Secured Rest API urls with LDAP basic authentication -->
 		<scr:http pattern="/api/**" use-expressions="true" authentication-manager-ref="apiAccessAuthenticationManager">


Mime
View raw message