Skip to content

Commit a07cbe4

Browse files
malaqueueitmalaqueueit
committed
Moved from andling urls with Uri class to strings to support urls with invalid characters + added security on cookie
1 parent 6ac2826 commit a07cbe4

33 files changed

+297
-295
lines changed

‎QueueIT.Security.Examples/web/META-INF/context.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Context antiJARLocking="true" path="/QueueIT.Security.Examples"/>

‎QueueIT.Security.Examples/web/WEB-INF/tags/master.tag‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="viewport" content="width=device-width" />
1010
<link rel="stylesheet" href="Content/Site.css" />
1111
</head>
12-
<body>
12+
<body id="<jsp:invoke fragment="title"/>">
1313
<header>
1414
<div class="content-wrapper">
1515
<div class="float-left">

‎QueueIT.Security.Examples/web/advanced.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
try
77
{
88
9-
IValidateResult result = SessionValidationController.validateRequest("advanced", new URI("http://www.google.com"));
9+
IValidateResult result = SessionValidationController.validateRequest(QueueFactory.createQueue("advanced"), "http://www.google.com");
1010
1111
// Check if user must be enqueued
1212
if (result instanceof EnqueueResult)
1313
{
14-
response.sendRedirect(((EnqueueResult)result).getRedirectUrl().toString());
14+
response.sendRedirect(((EnqueueResult)result).getRedirectUrl());
1515
return;
1616
}
1717
@@ -46,7 +46,7 @@
4646
%>
4747
<t:master>
4848
<jsp:attribute name="title">
49-
Advanced
49+
Advanced Queue Configuration
5050
</jsp:attribute>
5151
<jsp:attribute name="body">
5252
<h3>Setting up the queue:</h3>

‎QueueIT.Security.Examples/web/advancedlanding.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<%
66
IQueue queue = QueueFactory.createQueue("advanced");
77
String targetUrl = request.getParameter("t");
8-
request.setAttribute("queueUrl", queue.getQueueUrl(new URI(targetUrl)));
8+
request.setAttribute("queueUrl", queue.getQueueUrl(targetUrl));
99
%>
1010
<t:master>
1111
<jsp:attribute name="title">
12-
Advanced
12+
Advanced Queue Landing Page
1313
</jsp:attribute>
1414
<jsp:attribute name="body">
1515
<a href="index.jsp">Back To Home</a> <a href="${queueUrl}">Go to queue</a>

‎QueueIT.Security.Examples/web/cancel.jsp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<%
66
try
77
{
8-
IValidateResult result = SessionValidationController.validateRequest("ticketania", request.getParameter("eventid"));
8+
IValidateResult result = SessionValidationController.validateRequest("ticketania", request.getParameter("eventId"));
99
1010
// Check if user must be enqueued
1111
if (result instanceof AcceptedConfirmedResult)

‎QueueIT.Security.Examples/web/codeonly.jsp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Check if user must be enqueued
1313
if (result instanceof EnqueueResult)
1414
{
15-
response.sendRedirect(((EnqueueResult)result).getRedirectUrl().toString());
15+
response.sendRedirect(((EnqueueResult)result).getRedirectUrl());
1616
return;
1717
}
1818
}
@@ -31,7 +31,7 @@
3131
%>
3232
<t:master>
3333
<jsp:attribute name="title">
34-
Queue-it
34+
Code Only Queue Configuration
3535
</jsp:attribute>
3636
<jsp:attribute name="body">
3737
<h3>Setting up the queue:</h3>

‎QueueIT.Security.Examples/web/error.jsp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
// Never call request validation from error handling pages (e.g. error.jsp) which will cause users to get looped arround.
88
99
String queueName = request.getParameter("queuename");
10-
URI targetUrl = new URI(request.getParameter("t"));
10+
String targetUrl = request.getParameter("t");
1111
IQueue queue = QueueFactory.createQueue(queueName);
12-
String cancelUrl = queue.getCancelUrl(targetUrl).toString();
12+
String cancelUrl = queue.getCancelUrl(targetUrl);
1313
1414
request.setAttribute("cancelUrl", cancelUrl);
1515
%>
1616
<t:master>
1717
<jsp:attribute name="title">
18-
Queue-it
18+
Error Page
1919
</jsp:attribute>
2020
<jsp:attribute name="body">
2121
<div>An error occured.</div>

‎QueueIT.Security.Examples/web/link.jsp‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
<%@page import="java.net.URI"%>
2-
<%@page import="javax.ws.rs.core.UriBuilder"%>
31
<%@page import="queueit.security.*"%>
42
<%@page contentType="text/html" pageEncoding="UTF-8"%>
53
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
64
<%
75
IQueue queue = QueueFactory.createQueue("link");
86
9-
URI targetUrl = new URI(request.getRequestURL().toString().replaceAll("link.jsp", "linktarget.jsp"));
10-
String queueUrl = queue.getQueueUrl(targetUrl).toString();
7+
String targetUrl = request.getRequestURL().toString().replaceAll("link.jsp", "linktarget.jsp");
8+
String queueUrl = queue.getQueueUrl(targetUrl);
119
1210
request.setAttribute("queueUrl", queueUrl);
1311
%>
1412

1513
<t:master>
1614
<jsp:attribute name="title">
17-
Link
15+
Link Queue Configuration
1816
</jsp:attribute>
1917
<jsp:attribute name="body">
2018
<h3>Setting up the queue:</h3>

‎QueueIT.Security.Examples/web/linktarget.jsp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<%@page import="java.net.URLEncoder"%>
22
<%@page import="java.util.Date"%>
3-
<%@page import="java.net.URI"%>
4-
<%@page import="javax.ws.rs.core.UriBuilder"%>
53
<%@page import="queueit.security.*"%>
64
<%@page contentType="text/html" pageEncoding="UTF-8"%>
75
<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
@@ -30,7 +28,7 @@
3028

3129
<t:master>
3230
<jsp:attribute name="title">
33-
Link
31+
Link Target
3432
</jsp:attribute>
3533
<jsp:attribute name="body">
3634
<h3>Setting up the queue:</h3>

‎QueueIT.Security.Examples/web/simple.jsp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<%@page import="java.net.URI"%>
21
<%@page import="java.util.concurrent.Callable"%>
32
<%@page import="queueit.security.*"%>
43
<%@page contentType="text/html" pageEncoding="UTF-8"%>
@@ -23,7 +22,7 @@
2322
{
2423
String currentUrl = request.getRequestURL().toString();
2524
cancelUrl = result.getQueue().getCancelUrl(
26-
new URI(currentUrl.substring(0, currentUrl.indexOf("simple.jsp")) + "cancel.jsp?eventId=simple")).toString();
25+
currentUrl.substring(0, currentUrl.indexOf("simple.jsp")) + "cancel.jsp?eventId=simple");
2726
expireUrl = "expire.jsp?eventid=simple";
2827
2928
request.setAttribute("cancelUrl", cancelUrl);
@@ -45,7 +44,7 @@
4544
%>
4645
<t:master>
4746
<jsp:attribute name="title">
48-
Simple
47+
Simple Queue Configuration
4948
</jsp:attribute>
5049
<jsp:attribute name="body">
5150
<h3>Setting up the queue:</h3>

0 commit comments

Comments
 (0)