This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/master by this push:
new ec726a4 minor, api format
ec726a4 is described below
commit ec726a49cdf00e3f8cba5efa25609c81f5e389a7
Author: shaofengshi <[email protected]>
AuthorDate: Sat Jul 18 16:42:06 2020 +0800
minor, api format
Signed-off-by: shaofengshi <[email protected]>
---
kubernetes/config/production/kylin-more/kylinSecurity.xml | 3 +--
.../template/production/example/config/kylin-more/kylinSecurity.xml | 3 +--
.../src/test/java/org/apache/kylin/restclient/ITRestClientTest.java | 1 +
server/src/main/resources/kylinSecurity.xml | 4 +---
4 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/kubernetes/config/production/kylin-more/kylinSecurity.xml
b/kubernetes/config/production/kylin-more/kylinSecurity.xml
index 6116433..091ae37 100644
--- a/kubernetes/config/production/kylin-more/kylinSecurity.xml
+++ b/kubernetes/config/production/kylin-more/kylinSecurity.xml
@@ -251,7 +251,7 @@
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin/public_config"
access="permitAll"/>
<scr:intercept-url pattern="/api/admin/version"
access="permitAll"/>
- <scr:intercept-url pattern="/api/projects" access="permitAll"/>
+ <scr:intercept-url pattern="/api/projects"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
<scr:intercept-url pattern="/api/**" access="isAuthenticated()"/>
@@ -298,7 +298,6 @@
<scr:intercept-url pattern="/api/models*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/streaming*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
- <scr:intercept-url pattern="/api/admin/config" access="permitAll"/>
<scr:intercept-url pattern="/api/projects*/*"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
diff --git
a/kubernetes/template/production/example/config/kylin-more/kylinSecurity.xml
b/kubernetes/template/production/example/config/kylin-more/kylinSecurity.xml
index 6116433..091ae37 100644
--- a/kubernetes/template/production/example/config/kylin-more/kylinSecurity.xml
+++ b/kubernetes/template/production/example/config/kylin-more/kylinSecurity.xml
@@ -251,7 +251,7 @@
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin/public_config"
access="permitAll"/>
<scr:intercept-url pattern="/api/admin/version"
access="permitAll"/>
- <scr:intercept-url pattern="/api/projects" access="permitAll"/>
+ <scr:intercept-url pattern="/api/projects"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
<scr:intercept-url pattern="/api/**" access="isAuthenticated()"/>
@@ -298,7 +298,6 @@
<scr:intercept-url pattern="/api/models*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/streaming*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
- <scr:intercept-url pattern="/api/admin/config" access="permitAll"/>
<scr:intercept-url pattern="/api/projects*/*"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
diff --git
a/kylin-it/src/test/java/org/apache/kylin/restclient/ITRestClientTest.java
b/kylin-it/src/test/java/org/apache/kylin/restclient/ITRestClientTest.java
index c97f08b..adf98fa 100644
--- a/kylin-it/src/test/java/org/apache/kylin/restclient/ITRestClientTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/restclient/ITRestClientTest.java
@@ -64,6 +64,7 @@ public class ITRestClientTest extends HBaseMetadataTestCase {
logger.info("random jetty port: " + PORT);
sysPropsOverride.override("spring.profiles.active", "testing");
sysPropsOverride.override("catalina.home", "."); //
resources/log4j.properties ref ${catalina.home}
+ sysPropsOverride.override("kylin.web.set-config-enable", "true");
staticCreateTestMetadata();
startJetty();
}
diff --git a/server/src/main/resources/kylinSecurity.xml
b/server/src/main/resources/kylinSecurity.xml
index 912f700..aa92f4b 100644
--- a/server/src/main/resources/kylinSecurity.xml
+++ b/server/src/main/resources/kylinSecurity.xml
@@ -253,9 +253,8 @@
<scr:intercept-url pattern="/api/streaming*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin/public_config"
access="permitAll"/>
- <scr:intercept-url pattern="/api/admin/config" access="permitAll"/>
<scr:intercept-url pattern="/api/admin/version"
access="permitAll"/>
- <scr:intercept-url pattern="/api/projects" access="permitAll"/>
+ <scr:intercept-url pattern="/api/projects"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
<scr:intercept-url pattern="/api/**" access="isAuthenticated()"/>
@@ -305,7 +304,6 @@
<scr:intercept-url pattern="/api/models*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/streaming*/**"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/job*/**"
access="isAuthenticated()"/>
- <scr:intercept-url pattern="/api/admin/config" access="permitAll"/>
<scr:intercept-url pattern="/api/projects*/*"
access="isAuthenticated()"/>
<scr:intercept-url pattern="/api/admin*/**"
access="hasRole('ROLE_ADMIN')"/>
<scr:intercept-url pattern="/api/tables/**/snapshotLocalCache/**"
access="permitAll"/>
