This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 2d8ec640980091dc34a57a9e5b6df53eb8c2cc9a Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Mon Apr 26 19:31:21 2021 +0200 JASPIC configuration (missing permissions) Signed-off-by: Jean-Louis Monteiro <[email protected]> --- .../tomee-plume/conf/ProviderConfiguration.xml | 86 +++++++++++----------- src/test/tomee-plume/conf/catalina.policy | 14 ++++ src/test/tomee-plume/conf/context.xml | 8 -- 3 files changed, 57 insertions(+), 51 deletions(-) diff --git a/src/test/tomee-plume/conf/ProviderConfiguration.xml b/src/test/tomee-plume/conf/ProviderConfiguration.xml index ff72155..e21cbff 100644 --- a/src/test/tomee-plume/conf/ProviderConfiguration.xml +++ b/src/test/tomee-plume/conf/ProviderConfiguration.xml @@ -18,47 +18,47 @@ --> <provider-config - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://java.oracle.com/xml/ns/jaspic"; - xsi:schemaLocation="http://java.oracle.com/xml/ns/jaspic provider-configuration.xsd"> - <provider-config-entry> - <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class> - <properties version="1.0"> - <entry key="AuthStatus_SEND_SUCCESS">false</entry> - <entry key="requestPolicy">USER_NAME_PASSWORD</entry> - </properties> - <message-layer>SOAP</message-layer> - <app-context-id>null</app-context-id> - <reg-description>TestSuite JSR 196 Config Provider</reg-description> - </provider-config-entry> - <provider-config-entry> - <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class> - <properties version="1.0"> - <entry key="AuthStatus_SEND_SUCCESS">false</entry> - <entry key="requestPolicy">USER_NAME_PASSWORD</entry> - </properties> - <message-layer>SOAP</message-layer> - <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id> - <reg-description>TestSuite JSR 196 Config Provider</reg-description> - </provider-config-entry> - <provider-config-entry> - <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class> - <properties version="1.0"> - <entry key="AuthStatus_SEND_SUCCESS">true</entry> - <entry key="requestPolicy">USER_NAME_PASSWORD</entry> - </properties> - <message-layer>HttpServlet</message-layer> - <app-context-id>Catalina/localhost /spitests_servlet_web</app-context-id> - <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description> - </provider-config-entry> - <provider-config-entry> - <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class> - <properties version="1.0"> - <entry key="AuthStatus_SEND_SUCCESS">true</entry> - <entry key="requestPolicy">USER_NAME_PASSWORD</entry> - </properties> - <message-layer>HttpServlet</message-layer> - <app-context-id>Catalina/localhost /spitests_servlet_web/WrapperServlet</app-context-id> - <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description> - </provider-config-entry> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="http://java.oracle.com/xml/ns/jaspic"; + xsi:schemaLocation="http://java.oracle.com/xml/ns/jaspic provider-configuration.xsd"> + <provider-config-entry> + <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class> + <properties version="1.0"> + <entry key="AuthStatus_SEND_SUCCESS">false</entry> + <entry key="requestPolicy">USER_NAME_PASSWORD</entry> + </properties> + <message-layer>SOAP</message-layer> + <app-context-id>null</app-context-id> + <reg-description>TestSuite JSR 196 Config Provider</reg-description> + </provider-config-entry> + <provider-config-entry> + <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProvider</provider-class> + <properties version="1.0"> + <entry key="AuthStatus_SEND_SUCCESS">false</entry> + <entry key="requestPolicy">USER_NAME_PASSWORD</entry> + </properties> + <message-layer>SOAP</message-layer> + <app-context-id>Catalina/localhost /Hello_web/Hello</app-context-id> + <reg-description>TestSuite JSR 196 Config Provider</reg-description> + </provider-config-entry> + <provider-config-entry> + <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class> + <properties version="1.0"> + <entry key="AuthStatus_SEND_SUCCESS">true</entry> + <entry key="requestPolicy">USER_NAME_PASSWORD</entry> + </properties> + <message-layer>HttpServlet</message-layer> + <app-context-id>Catalina/localhost /spitests_servlet_web</app-context-id> + <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description> + </provider-config-entry> + <provider-config-entry> + <provider-class>com.sun.ts.tests.jaspic.tssv.config.TSAuthConfigProviderServlet</provider-class> + <properties version="1.0"> + <entry key="AuthStatus_SEND_SUCCESS">true</entry> + <entry key="requestPolicy">USER_NAME_PASSWORD</entry> + </properties> + <message-layer>HttpServlet</message-layer> + <app-context-id>Catalina/localhost /spitests_servlet_web/WrapperServlet</app-context-id> + <reg-description>Registration for TSAuthConfigProviderServlet using spitests_servlet_web</reg-description> + </provider-config-entry> </provider-config> diff --git a/src/test/tomee-plume/conf/catalina.policy b/src/test/tomee-plume/conf/catalina.policy index 4413ba4..4fb8777 100644 --- a/src/test/tomee-plume/conf/catalina.policy +++ b/src/test/tomee-plume/conf/catalina.policy @@ -292,6 +292,20 @@ grant codeBase "file:${catalina.home}/webapps/host-manager/-" { // }; // TomEE for CTS configuration +grant codeBase "file:${cts.home}/dist/com/sun/ts/tests/jaspic/-" { + permission java.io.FilePermission "${catalina.base}/conf/-", "read"; + permission java.io.FilePermission "${catalina.base}/conf/jaspic-providers.xml", "read,write,delete"; // Tomcat ACF + permission java.io.FilePermission "${catalina.base}/conf/jaspic-providers.xml.new", "read,write,delete"; // Tomcat ACF + permission java.io.FilePermission "${catalina.base}/conf/jaspic-providers.xml.old", "read,write,delete"; // Tomcat ACF + permission java.io.FilePermission "${catalina.base}/temp/-", "read,write"; + permission java.io.FilePermission "${catalina.base}/logs/-", "read,write"; + permission java.io.FilePermission "${catalina.base}/work/-", "read,write"; + permission java.util.PropertyPermission "*", "read,write"; // the log file + permission java.security.SecurityPermission "getProperty.authconfigprovider.factory"; + permission java.security.SecurityPermission "setProperty.authconfigprovider.factory"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.catalina.authenticator.jaspic"; + permission java.util.logging.LoggingPermission "control"; +}; grant codeBase "file:${cts.home}/dist/com/sun/ts/tests/servlet/ee/spec/security/permissiondd/servlet_ee_spec_security_permissiondd_web/-" { permission java.util.PropertyPermission "cts.*", "read"; diff --git a/src/test/tomee-plume/conf/context.xml b/src/test/tomee-plume/conf/context.xml index 5d42cfe..3c422ef 100644 --- a/src/test/tomee-plume/conf/context.xml +++ b/src/test/tomee-plume/conf/context.xml @@ -30,14 +30,6 @@ --> <Valve className="org.apache.openejb.cts.TransactionalWorkaroundLeakGuardValve"/> - <!-- Rollback this because it causes some other tests to fail because they test the Form authentication and Tomcat - Does not allow multiple authenticator valve - We need to hear back or to find a way to only add this for jaspic webapp or tests - - <Valve className="org.apache.catalina.authenticator.BasicAuthenticator" - jaspicCallbackHandlerClass="org.apache.openejb.cts.CallbackHandlerImpl" - /> - --> <Environment name="myUrl" value="http://google.com"; type="java.net.URL" override="false"/>
