SAK-32521 Fix the oauth admin tool. (sakaiproject#4454)

* SAK-32521 Remove execute permission from files. Lots of the files in the oauth directory incorrectly had execute permission on them. * SAK-32521 Fix so that the oauth admin tool works. This looks to be a bit of a hack, but it means that the standard portal URL gets redirected to one with a trailing slash that then allows the portal to work correctly.
susowrc · Jun 8, 2017 · 0cab6f7 · 0cab6f7
1 parent e8028b2
commit 0cab6f7
Show file tree

Hide file tree

Showing 62 changed files with 6 additions and 0 deletions.
diff --git a/oauth/README.md b/oauth/README.md
diff --git a/oauth/api/pom.xml b/oauth/api/pom.xml
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/dao/AccessorDao.java b/oauth/api/src/java/org/sakaiproject/oauth/dao/AccessorDao.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/dao/ConsumerDao.java b/oauth/api/src/java/org/sakaiproject/oauth/dao/ConsumerDao.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/domain/Accessor.java b/oauth/api/src/java/org/sakaiproject/oauth/domain/Accessor.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/domain/Consumer.java b/oauth/api/src/java/org/sakaiproject/oauth/domain/Consumer.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/ExpiredAccessorException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/ExpiredAccessorException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidAccessorException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidAccessorException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidConsumerException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidConsumerException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidVerifierException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/InvalidVerifierException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/OAuthException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/OAuthException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/exception/RevokedAccessorException.java b/oauth/api/src/java/org/sakaiproject/oauth/exception/RevokedAccessorException.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/filter/OAuthPostFilter.java b/oauth/api/src/java/org/sakaiproject/oauth/filter/OAuthPostFilter.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/filter/OAuthPreFilter.java b/oauth/api/src/java/org/sakaiproject/oauth/filter/OAuthPreFilter.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthAdminService.java b/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthAdminService.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthHttpService.java b/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthHttpService.java
diff --git a/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthService.java b/oauth/api/src/java/org/sakaiproject/oauth/service/OAuthService.java
diff --git a/oauth/dao-hbm/pom.xml b/oauth/dao-hbm/pom.xml
diff --git a/oauth/dao-hbm/src/java/org/sakaiproject/oauth/dao/HibernateAccessorDao.java b/oauth/dao-hbm/src/java/org/sakaiproject/oauth/dao/HibernateAccessorDao.java
diff --git a/oauth/dao-hbm/src/java/org/sakaiproject/oauth/dao/HibernateConsumerDao.java b/oauth/dao-hbm/src/java/org/sakaiproject/oauth/dao/HibernateConsumerDao.java
diff --git a/oauth/dao-hbm/src/resources/org/sakaiproject/oauth/dao/Accessor.hbm.xml b/oauth/dao-hbm/src/resources/org/sakaiproject/oauth/dao/Accessor.hbm.xml
diff --git a/oauth/dao-hbm/src/resources/org/sakaiproject/oauth/dao/Consumer.hbm.xml b/oauth/dao-hbm/src/resources/org/sakaiproject/oauth/dao/Consumer.hbm.xml
diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/advisor/CollectingPermissionsAdvisor.java b/oauth/impl/src/java/org/sakaiproject/oauth/advisor/CollectingPermissionsAdvisor.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/advisor/LimitedPermissionsAdvisor.java b/oauth/impl/src/java/org/sakaiproject/oauth/advisor/LimitedPermissionsAdvisor.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryAccessorDao.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/MemoryConsumerDao.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java b/oauth/impl/src/java/org/sakaiproject/oauth/dao/ServerConfigConsumerDao.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthAdminServiceImpl.java b/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthAdminServiceImpl.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthHttpServiceImpl.java b/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthHttpServiceImpl.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthServiceImpl.java b/oauth/impl/src/java/org/sakaiproject/oauth/service/OAuthServiceImpl.java
diff --git a/oauth/impl/src/java/org/sakaiproject/oauth/service/Util.java b/oauth/impl/src/java/org/sakaiproject/oauth/service/Util.java
diff --git a/oauth/impl/src/webapp/WEB-INF/components.xml b/oauth/impl/src/webapp/WEB-INF/components.xml
diff --git a/oauth/pom.xml b/oauth/pom.xml
diff --git a/oauth/tool/pom.xml b/oauth/tool/pom.xml
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/servlet/AccessTokenServlet.java b/oauth/tool/src/java/org/sakaiproject/oauth/servlet/AccessTokenServlet.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/servlet/AuthorisationServlet.java b/oauth/tool/src/java/org/sakaiproject/oauth/servlet/AuthorisationServlet.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/servlet/RequestTokenServlet.java b/oauth/tool/src/java/org/sakaiproject/oauth/servlet/RequestTokenServlet.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/tool/admin/AdminFilter.java b/oauth/tool/src/java/org/sakaiproject/oauth/tool/admin/AdminFilter.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.java b/oauth/tool/src/java/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/tool/user/OAuthApplication.java b/oauth/tool/src/java/org/sakaiproject/oauth/tool/user/OAuthApplication.java
diff --git a/oauth/tool/src/java/org/sakaiproject/oauth/tool/user/pages/ListAccessors.java b/oauth/tool/src/java/org/sakaiproject/oauth/tool/user/pages/ListAccessors.java
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.html b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.html
diff --git a/...l/src/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.properties b/...l/src/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration.properties
diff --git a/...rc/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration_fr.properties b/...rc/resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration_fr.properties
diff --git a/...resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration_zh_CN.properties b/...resources/org/sakaiproject/oauth/tool/admin/pages/ConsumerAdministration_zh_CN.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers.html b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers.html
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers_fr.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers_fr.properties
diff --git a/...tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers_zh_CN.properties b/...tool/src/resources/org/sakaiproject/oauth/tool/admin/pages/ListConsumers_zh_CN.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage.html b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage.html
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage_fr.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage_fr.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage_zh_CN.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/pages/SakaiPage_zh_CN.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors.html b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors.html
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors.properties
diff --git a/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors_fr.properties b/oauth/tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors_fr.properties
diff --git a/.../tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors_zh_CN.properties b/.../tool/src/resources/org/sakaiproject/oauth/tool/user/pages/ListAccessors_zh_CN.properties
diff --git a/oauth/tool/src/webapp/WEB-INF/applicationContext.xml b/oauth/tool/src/webapp/WEB-INF/applicationContext.xml
diff --git a/oauth/tool/src/webapp/WEB-INF/tools/sakai.oauth.admin.xml b/oauth/tool/src/webapp/WEB-INF/tools/sakai.oauth.admin.xml
diff --git a/oauth/tool/src/webapp/WEB-INF/web.xml b/oauth/tool/src/webapp/WEB-INF/web.xml
@@ -75,6 +75,12 @@
             <param-name>applicationClassName</param-name>
             <param-value>org.sakaiproject.oauth.tool.admin.OauthAdminApplication</param-value>
         </init-param>
+        <!-- This gets the initial URL to the tool that doesn't include a trailing slash redirected to
+             the same URL with a trailing slash. Seems like a bit of a quirk, but it works. -->
+        <init-param>
+            <param-name>filterMappingUrlPattern</param-name>
+            <param-value>/*</param-value>
+        </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

diff --git a/oauth/tool/src/webapp/authorise.jsp b/oauth/tool/src/webapp/authorise.jsp