You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2014/02/25 10:58:33 UTC
[1/2] git commit: Moves jsps under WEB-INF
Repository: struts
Updated Branches:
refs/heads/feature/move-jsps-under-webinf 7d383d6d3 -> 6f43464fc
Moves jsps under WEB-INF
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6b00db2d
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6b00db2d
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6b00db2d
Branch: refs/heads/feature/move-jsps-under-webinf
Commit: 6b00db2d23acf93f83563715aa0deaeb0a245785
Parents: 7d383d6
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Feb 25 10:56:53 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Feb 25 10:56:53 2014 +0100
----------------------------------------------------------------------
apps/jboss-blank/src/main/resources/example.xml | 6 ++---
.../webapp/WEB-INF/jsp/example/HelloWorld.jsp | 28 ++++++++++++++++++++
.../main/webapp/WEB-INF/jsp/example/Login.jsp | 15 +++++++++++
.../main/webapp/WEB-INF/jsp/example/Menu.jsp | 3 +++
.../main/webapp/WEB-INF/jsp/example/Missing.jsp | 11 ++++++++
.../webapp/WEB-INF/jsp/example/Register.jsp | 3 +++
.../main/webapp/WEB-INF/jsp/example/Welcome.jsp | 18 +++++++++++++
.../src/main/webapp/example/HelloWorld.jsp | 28 --------------------
.../src/main/webapp/example/Login.jsp | 15 -----------
.../src/main/webapp/example/Menu.jsp | 3 ---
.../src/main/webapp/example/Missing.jsp | 11 --------
.../src/main/webapp/example/Register.jsp | 3 ---
.../src/main/webapp/example/Welcome.jsp | 18 -------------
13 files changed, 81 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/resources/example.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/resources/example.xml b/apps/jboss-blank/src/main/resources/example.xml
index e93d84e..d929de1 100644
--- a/apps/jboss-blank/src/main/resources/example.xml
+++ b/apps/jboss-blank/src/main/resources/example.xml
@@ -8,16 +8,16 @@
<package name="example" namespace="/example" extends="struts-default">
<action name="HelloWorld" class="example.HelloWorld">
- <result>/example/HelloWorld.jsp</result>
+ <result>/WEB-INF/jsp/example/HelloWorld.jsp</result>
</action>
<action name="Login_*" method="{1}" class="example.Login">
- <result name="input">/example/Login.jsp</result>
+ <result name="input">/WEB-INF/jsp/example/Login.jsp</result>
<result type="redirectAction">Menu</result>
</action>
<action name="*" class="example.ExampleSupport">
- <result>/example/{1}.jsp</result>
+ <result>/WEB-INF/jsp/example/{1}.jsp</result>
</action>
<!-- Add actions here -->
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
new file mode 100644
index 0000000..938c761
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
@@ -0,0 +1,28 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+ <title><s:text name="HelloWorld.message"/></title>
+</head>
+
+<body>
+<h2><s:property value="message"/></h2>
+
+<h3>Languages</h3>
+<ul>
+ <li>
+ <s:url id="url" action="HelloWorld">
+ <s:param name="request_locale">en</s:param>
+ </s:url>
+ <s:a href="%{url}">English</s:a>
+ </li>
+ <li>
+ <s:url id="url" action="HelloWorld">
+ <s:param name="request_locale">es</s:param>
+ </s:url>
+ <s:a href="%{url}">Espanol</s:a>
+ </li>
+</ul>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
new file mode 100644
index 0000000..6438080
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
@@ -0,0 +1,15 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+ <title>Sign On</title>
+</head>
+
+<body>
+<s:form action="Login">
+ <s:textfield key="username"/>
+ <s:password key="password" />
+ <s:submit/>
+</s:form>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
new file mode 100644
index 0000000..7c01ac9
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
@@ -0,0 +1,11 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head><title>Missing Feature</title></head>
+
+<body>
+<p>
+ <s:text name="Missing.message"/>
+</p>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
new file mode 100644
index 0000000..a74bd2c
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
@@ -0,0 +1,3 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
new file mode 100644
index 0000000..64ffe9b
--- /dev/null
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
@@ -0,0 +1,18 @@
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib prefix="s" uri="/struts-tags" %>
+<html>
+<head>
+ <title>Welcome</title>
+ <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
+ type="text/css"/>
+</head>
+
+<body>
+<h3>Commands</h3>
+<ul>
+ <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
+ <li><a href="<s:url action="Register"/>">Register</a></li>
+</ul>
+
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp b/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp
deleted file mode 100644
index 5ca6402..0000000
--- a/apps/jboss-blank/src/main/webapp/example/HelloWorld.jsp
+++ /dev/null
@@ -1,28 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
- <title><s:text name="HelloWorld.message"/></title>
-</head>
-
-<body>
-<h2><s:property value="message"/></h2>
-
-<h3>Languages</h3>
-<ul>
- <li>
- <s:url id="url" action="HelloWorld">
- <s:param name="request_locale">en</s:param>
- </s:url>
- <s:a href="%{url}">English</s:a>
- </li>
- <li>
- <s:url id="url" action="HelloWorld">
- <s:param name="request_locale">es</s:param>
- </s:url>
- <s:a href="%{url}">Espanol</s:a>
- </li>
-</ul>
-
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/Login.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/Login.jsp b/apps/jboss-blank/src/main/webapp/example/Login.jsp
deleted file mode 100644
index 2b77ac2..0000000
--- a/apps/jboss-blank/src/main/webapp/example/Login.jsp
+++ /dev/null
@@ -1,15 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
- <title>Sign On</title>
-</head>
-
-<body>
-<s:form action="Login">
- <s:textfield key="username"/>
- <s:password key="password" />
- <s:submit/>
-</s:form>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/Menu.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/Menu.jsp b/apps/jboss-blank/src/main/webapp/example/Menu.jsp
deleted file mode 100644
index 3fbc54b..0000000
--- a/apps/jboss-blank/src/main/webapp/example/Menu.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/Missing.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/Missing.jsp b/apps/jboss-blank/src/main/webapp/example/Missing.jsp
deleted file mode 100644
index d2f0023..0000000
--- a/apps/jboss-blank/src/main/webapp/example/Missing.jsp
+++ /dev/null
@@ -1,11 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head><title>Missing Feature</title></head>
-
-<body>
-<p>
- <s:text name="Missing.message"/>
-</p>
-</body>
-</html>
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/Register.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/Register.jsp b/apps/jboss-blank/src/main/webapp/example/Register.jsp
deleted file mode 100644
index 3fbc54b..0000000
--- a/apps/jboss-blank/src/main/webapp/example/Register.jsp
+++ /dev/null
@@ -1,3 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<s:include value="Missing.jsp"/>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/struts/blob/6b00db2d/apps/jboss-blank/src/main/webapp/example/Welcome.jsp
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/example/Welcome.jsp b/apps/jboss-blank/src/main/webapp/example/Welcome.jsp
deleted file mode 100644
index 23ae4b8..0000000
--- a/apps/jboss-blank/src/main/webapp/example/Welcome.jsp
+++ /dev/null
@@ -1,18 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" %>
-<%@ taglib prefix="s" uri="/struts-tags" %>
-<html>
-<head>
- <title>Welcome</title>
- <link href="<s:url value="/css/examplecss"/>" rel="stylesheet"
- type="text/css"/>
-</head>
-
-<body>
-<h3>Commands</h3>
-<ul>
- <li><a href="<s:url action="Login_input"/>">Sign On</a></li>
- <li><a href="<s:url action="Register"/>">Register</a></li>
-</ul>
-
-</body>
-</html>
[2/2] git commit: Adds security constraints to block access to jsp
files
Posted by lu...@apache.org.
Adds security constraints to block access to jsp files
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/6f43464f
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/6f43464f
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/6f43464f
Branch: refs/heads/feature/move-jsps-under-webinf
Commit: 6f43464fcaab59e7345a3e394db4a969cf410d15
Parents: 6b00db2
Author: Lukasz Lenart <lu...@apache.org>
Authored: Tue Feb 25 10:57:21 2014 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Tue Feb 25 10:57:21 2014 +0100
----------------------------------------------------------------------
.../jboss-blank/src/main/webapp/WEB-INF/web.xml | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/6f43464f/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
index 4902479..88c6fc8 100644
--- a/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
+++ b/apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
@@ -17,4 +17,24 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
+ <!-- Restricts access to pure JSP files - access available only via Struts action -->
+ <security-constraint>
+ <display-name>No direct JSP access</display-name>
+ <web-resource-collection>
+ <web-resource-name>No-JSP</web-resource-name>
+ <url-pattern>*.jsp</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>no-users</role-name>
+ </auth-constraint>
+ <user-data-constraint>
+ <transport-guarantee>NONE</transport-guarantee>
+ </user-data-constraint>
+ </security-constraint>
+
+ <security-role>
+ <description>Don't assign users to this role</description>
+ <role-name>no-users</role-name>
+ </security-role>
+
</web-app>