Skip to content

Escaping of user input #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Escaping of user input #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6eb847f
ignoring target/
Feb 18, 2016
738dea5
Ozark -> 1.0.0-m02
Feb 18, 2016
c6ccabc
fixing ambiguous resource method exception
Feb 18, 2016
2fdf892
escaping user input
Feb 18, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ hs_err_pid*

# IntelliJ
.idea/
*.iml
*.iml

# Maven
target/
4 changes: 2 additions & 2 deletions controllers/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<dependencies>
<dependency>
<groupId>com.oracle.ozark</groupId>
<groupId>org.glassfish.ozark</groupId>
<artifactId>ozark</artifactId>
<version>1.0.0-m01</version>
<version>1.0.0-m02</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/HybridController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.controllers;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.core.Response;
Expand Down
2 changes: 1 addition & 1 deletion controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/PostController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.mscharhag.javaee8.mvc.controllers;

import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.ws.rs.POST;
import javax.ws.rs.Path;

Expand Down
6 changes: 3 additions & 3 deletions controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ReturnTypesController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mscharhag.javaee8.mvc.controllers;

import javax.mvc.Controller;
import javax.mvc.View;
import javax.mvc.annotation.Controller;
import javax.mvc.annotation.View;
import javax.mvc.Viewable;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand All @@ -24,7 +24,7 @@ public String returnString() {
}

@GET
@Path("return-string")
@Path("return-viewable")
public Viewable returnViewable() {
return new Viewable("/WEB-INF/jsp/hello.jsp");
}
Expand Down
4 changes: 2 additions & 2 deletions controllers/src/main/java/com/mscharhag/javaee8/mvc/controllers/ViewController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mscharhag.javaee8.mvc.controllers;

import javax.mvc.Controller;
import javax.mvc.View;
import javax.mvc.annotation.Controller;
import javax.mvc.annotation.View;
import javax.ws.rs.GET;
import javax.ws.rs.Path;

Expand Down
2 changes: 1 addition & 1 deletion ...ollers/src/main/java/com/mscharhag/javaee8/mvc/controllers/product/ProductController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.mscharhag.javaee8.mvc.controllers.product;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
Expand Down
4 changes: 2 additions & 2 deletions getting-started/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<dependencies>
<dependency>
<groupId>com.oracle.ozark</groupId>
<groupId>org.glassfish.ozark</groupId>
<artifactId>ozark</artifactId>
<version>1.0.0-m01</version>
<version>1.0.0-m02</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
5 changes: 2 additions & 3 deletions getting-started/src/main/java/com/mscharhag/javaee8/mvc/getstarted/HelloController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.getstarted;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.Models;
import javax.mvc.annotation.Controller;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
Expand Down
2 changes: 1 addition & 1 deletion getting-started/src/main/webapp/WEB-INF/jsp/hello.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
</head>
<body>
<p>Getting started (hello.jsp)</p>
<h1>${text}</h1>
<h1>${mvc.encoders.html(text)}</h1>
</body>
</html>
4 changes: 2 additions & 2 deletions request-data/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@

<dependencies>
<dependency>
<groupId>com.oracle.ozark</groupId>
<groupId>org.glassfish.ozark</groupId>
<artifactId>ozark</artifactId>
<version>1.0.0-m01</version>
<version>1.0.0-m02</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/FormParamsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import javax.inject.Inject;
import javax.mvc.Controller;
import com.oracle.ozark.core.Models;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;

import javax.ws.rs.*;

Expand Down
5 changes: 2 additions & 3 deletions ...st-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/HeaderParamsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
Expand Down
5 changes: 2 additions & 3 deletions request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/PathParamsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.*;

@Controller
Expand Down
5 changes: 2 additions & 3 deletions ...est-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
Expand Down
5 changes: 2 additions & 3 deletions ...ata/src/main/java/com/mscharhag/javaee8/mvc/requestparams/QueryParamsFieldController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.QueryParam;
Expand Down
5 changes: 2 additions & 3 deletions request-data/src/main/java/com/mscharhag/javaee8/mvc/requestparams/RequestController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.mscharhag.javaee8.mvc.requestparams;

import com.oracle.ozark.core.Models;

import javax.inject.Inject;
import javax.mvc.Controller;
import javax.mvc.annotation.Controller;
import javax.mvc.Models;
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
Expand Down
2 changes: 1 addition & 1 deletion request-data/src/main/webapp/WEB-INF/jsp/form.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<title>Request Parameters</title>
</head>
<body>
<h1>${text}</h1>
<h1>${mvc.encoders.html(text)}</h1>

<form action="bean" method="post">
<label>ID:</label>
Expand Down
2 changes: 1 addition & 1 deletion request-data/src/main/webapp/WEB-INF/jsp/view.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
<title>Request Parameters</title>
</head>
<body>
<h1>${text}</h1>
<h1>${mvc.encoders.html(text)}</h1>
</body>
</html>