You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/06/21 09:41:34 UTC
openmeetings git commit: no jira: more work on config clean-up
Repository: openmeetings
Updated Branches:
refs/heads/master 837b9bec9 -> 2976a150a
no jira: more work on config clean-up
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2976a150
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2976a150
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2976a150
Branch: refs/heads/master
Commit: 2976a150a13ad4b7b9553cf6908b93c55dcf87b1
Parents: 837b9be
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Jun 21 16:41:27 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Jun 21 16:41:27 2017 +0700
----------------------------------------------------------------------
.../src/main/assembly/conf/jee-container.xml | 11 ++------
.../src/main/webapp/WEB-INF/web.xml | 27 +++++++++++++++-----
2 files changed, 22 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2976a150/openmeetings-server/src/main/assembly/conf/jee-container.xml
----------------------------------------------------------------------
diff --git a/openmeetings-server/src/main/assembly/conf/jee-container.xml b/openmeetings-server/src/main/assembly/conf/jee-container.xml
index 84778c4..79d274d 100644
--- a/openmeetings-server/src/main/assembly/conf/jee-container.xml
+++ b/openmeetings-server/src/main/assembly/conf/jee-container.xml
@@ -22,13 +22,6 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
">
- <!-- War deployer -->
- <bean id="warDeployer" class="org.red5.server.tomcat.WarDeployer">
- <property name="checkInterval" value="${war.deploy.server.check.interval}"/>
- <property name="webappFolder" value="${red5.root}/webapps"/>
- <!-- Expand war files prior to startup of the remaining services -->
- <property name="expandWars" value="true" />
- </bean>
<!--
The tomcat connectors may be blocking or non-blocking. Select between either option via the protocol property.
Blocking I/O:
@@ -37,7 +30,7 @@
<property name="protocol" value="org.apache.coyote.http11.Http11NioProtocol" />
-->
<!-- Tomcat without SSL enabled -->
- <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader,warDeployer" lazy-init="true">
+ <bean id="tomcat.server" class="org.red5.server.tomcat.TomcatLoader" depends-on="context.loader" lazy-init="true">
<property name="webappFolder" value="${red5.root}/webapps" />
<property name="connectors">
<list>
@@ -103,7 +96,7 @@
<entry key="truststoreFile" value="${rtmps.truststorefile}" />
<entry key="truststorePass" value="${rtmps.truststorepass}" />
<entry key="clientAuth" value="false" />
- <entry key="allowUnsafeLegacyRenegotiation" value="true" />
+ <entry key="allowUnsafeLegacyRenegotiation" value="true" />
<entry key="maxKeepAliveRequests" value="${http.max_keep_alive_requests}"/>
<entry key="keepAliveTimout" value="-1"/>
<entry key="useExecutor" value="true"/>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2976a150/openmeetings-web/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/WEB-INF/web.xml b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
index b29624c..1e89d1a 100644
--- a/openmeetings-web/src/main/webapp/WEB-INF/web.xml
+++ b/openmeetings-web/src/main/webapp/WEB-INF/web.xml
@@ -104,6 +104,21 @@
<security-constraint>
<web-resource-collection>
+ <web-resource-name>Allowed methods</web-resource-name>
+ <url-pattern>/services/*</url-pattern>
+ <http-method-omission>TRACE</http-method-omission>
+ <http-method-omission>HEAD</http-method-omission>
+ </web-resource-collection>
+ <web-resource-collection>
+ <web-resource-name>Allowed methods</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <!-- no auth-constraint tag here -->
+ </security-constraint>
+ <security-constraint>
+ <web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
<url-pattern>/streams/*</url-pattern>
</web-resource-collection>
@@ -121,17 +136,15 @@
</web-resource-collection>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>PUT</http-method>
- <http-method>HEAD</http-method>
- <http-method>PATCH</http-method>
- <http-method>DELETE</http-method>
+ <url-pattern>/services/*</url-pattern>
<http-method>TRACE</http-method>
+ <http-method>HEAD</http-method>
</web-resource-collection>
<web-resource-collection>
<web-resource-name>Forbidden</web-resource-name>
- <url-pattern>/services/*</url-pattern>
- <http-method>TRACE</http-method>
+ <url-pattern>/*</url-pattern>
+ <http-method-omission>GET</http-method-omission>
+ <http-method-omission>POST</http-method-omission>
</web-resource-collection>
<auth-constraint/>
</security-constraint>