fixes #72
Change-Id: I60b924a6b086982786b6c11e8e70efa168119e0e
gae.mergeInto(new GigiApiException("You need to enter location and date!"));
}
gae.mergeInto(new GigiApiException("You need to enter location and date!"));
}
- if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("tos_agree")) || !"1".equals(req.getParameter("assertion"))) {
+ if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("assertion"))) {
gae.mergeInto(new GigiApiException("You failed to check all boxes to validate" + " your adherence to the rules and policies of SomeCA"));
}
if ("1".equals(req.getParameter("passwordReset"))) {
gae.mergeInto(new GigiApiException("You failed to check all boxes to validate" + " your adherence to the rules and policies of SomeCA"));
}
if ("1".equals(req.getParameter("passwordReset"))) {
<td><input type="checkbox" name="certify" value="1"></td>
<td><?=_I certify that ${name} has appeared in person.?></td>
</tr>
<td><input type="checkbox" name="certify" value="1"></td>
<td><?=_I certify that ${name} has appeared in person.?></td>
</tr>
- <tr>
- <td><input type="checkbox" name="tos_agree" value="1"></td>
- <td><?=_I verify that ${name} has accepted the Terms of Service (!'<a href="/policy/TermsOfService.html">'ToS!'</a>').?></td>
- </tr>
<tr>
<td><?=_Location?></td>
<td><input class="form-control" type="text" name="location" value="<?=$location?>"></td>
<tr>
<td><?=_Location?></td>
<td><input class="form-control" type="text" name="location" value="<?=$location?>"></td>
String cookie2 = login(u.getEmail(), TEST_PASSWORD);
URLConnection uc = TestAssurance.buildupAssureFormConnection(cookie2, email, true);
String avalue = RandomToken.generateToken(32);
String cookie2 = login(u.getEmail(), TEST_PASSWORD);
URLConnection uc = TestAssurance.buildupAssureFormConnection(cookie2, email, true);
String avalue = RandomToken.generateToken(32);
- uc.getOutputStream().write(("date=1910-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10&passwordReset=1&passwordResetValue=" + URLEncoder.encode(avalue, "UTF-8")).getBytes("UTF-8"));
+ uc.getOutputStream().write(("date=1910-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10&passwordReset=1&passwordResetValue=" + URLEncoder.encode(avalue, "UTF-8")).getBytes("UTF-8"));
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
assertNull(error);
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
assertNull(error);
}
private Matcher<String> isAssuranceForm() {
}
private Matcher<String> isAssuranceForm() {
- return containsString("type=\"checkbox\" name=\"tos_agree\"");
+ return containsString("<select name=\"assuranceType\">");
@Test
public void testAssureForm() throws IOException {
@Test
public void testAssureForm() throws IOException {
- executeSuccess("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeSuccess("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10");
}
@Test
public void testAssureFormContanisData() throws IOException {
URLConnection uc = buildupAssureFormConnection(true);
}
@Test
public void testAssureFormContanisData() throws IOException {
URLConnection uc = buildupAssureFormConnection(true);
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&rules=1&assertion=1&points=10").getBytes("UTF-8"));
uc.getOutputStream().flush();
String data = IOUtils.readURL(uc);
assertThat(data, containsString("2000-01-01"));
uc.getOutputStream().flush();
String data = IOUtils.readURL(uc);
assertThat(data, containsString("2000-01-01"));
public void testAssureFormNoCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
public void testAssureFormNoCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8"));
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
public void testAssureFormWrongCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
public void testAssureFormWrongCSRF() throws IOException {
// override csrf
HttpURLConnection uc = (HttpURLConnection) buildupAssureFormConnection(false);
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8"));
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10&csrf=aragc").getBytes("UTF-8"));
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
uc.getOutputStream().flush();
assertEquals(500, uc.getResponseCode());
}
assertNull(executeBasicWebInteraction(assureeCookie, MyDetails.PATH, newName + "&" + newDob + "&processDetails", 0));
assertNull(executeBasicWebInteraction(assureeCookie, MyDetails.PATH, newName + "&" + newDob + "&processDetails", 0));
- uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10").getBytes("UTF-8"));
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10").getBytes("UTF-8"));
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
if (succeed) {
uc.getOutputStream().flush();
String error = fetchStartErrorMessage(IOUtils.readURL(uc));
if (succeed) {
public void testAssureFormFuture() throws IOException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
int year = Integer.parseInt(sdf.format(new Date(System.currentTimeMillis()))) + 2;
public void testAssureFormFuture() throws IOException {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy");
int year = Integer.parseInt(sdf.format(new Date(System.currentTimeMillis()))) + 2;
- executeFails("date=" + year + "-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeFails("date=" + year + "-01-01&location=testcase&certify=1&rules=1&assertion=1&points=10");
c.setTimeInMillis(System.currentTimeMillis());
c.add(Calendar.HOUR_OF_DAY, 12);
c.setTimeInMillis(System.currentTimeMillis());
c.add(Calendar.HOUR_OF_DAY, 12);
- executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeSuccess("date=" + sdf.format(new Date(c.getTimeInMillis())) + "&location=testcase&certify=1&rules=1&assertion=1&points=10");
}
@Test
public void testAssureFormNoLoc() throws IOException {
}
@Test
public void testAssureFormNoLoc() throws IOException {
- executeFails("date=2000-01-01&location=a&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
- executeFails("date=2000-01-01&location=&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeFails("date=2000-01-01&location=a&certify=1&rules=1&assertion=1&points=10");
+ executeFails("date=2000-01-01&location=&certify=1&rules=1&assertion=1&points=10");
}
@Test
public void testAssureFormInvalDate() throws IOException {
}
@Test
public void testAssureFormInvalDate() throws IOException {
- executeFails("date=20000101&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
- executeFails("date=&location=testcase&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeFails("date=20000101&location=testcase&certify=1&rules=1&assertion=1&points=10");
+ executeFails("date=&location=testcase&certify=1&rules=1&assertion=1&points=10");
}
@Test
public void testAssureFormBoxes() throws IOException {
}
@Test
public void testAssureFormBoxes() throws IOException {
- executeFails("date=2000-01-01&location=testcase&certify=0&rules=1&tos_agree=1&assertion=1&points=10");
- executeFails("date=2000-01-01&location=testcase&certify=1&rules=&tos_agree=1&assertion=1&points=10");
- executeFails("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=a&assertion=1&points=10");
- executeFails("date=2000-01-01&location=testcase&certify=1&rules=1&tos_agree=1&assertion=z&points=10");
+ executeFails("date=2000-01-01&location=testcase&certify=0&rules=1&assertion=1&points=10");
+ executeFails("date=2000-01-01&location=testcase&certify=1&rules=&assertion=1&points=10");
+ executeFails("date=2000-01-01&location=testcase&certify=1&rules=1&assertion=z&points=10");
}
@Test
public void testAssureListingValid() throws IOException {
String uniqueLoc = createUniqueName();
}
@Test
public void testAssureListingValid() throws IOException {
String uniqueLoc = createUniqueName();
- execute("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ execute("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
String cookie = login(assureeM, TEST_PASSWORD);
URLConnection url = get(cookie, MyPoints.PATH);
String cookie = login(assureeM, TEST_PASSWORD);
URLConnection url = get(cookie, MyPoints.PATH);
@Test
public void testAssurerListingValid() throws IOException {
String uniqueLoc = createUniqueName();
@Test
public void testAssurerListingValid() throws IOException {
String uniqueLoc = createUniqueName();
- executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&tos_agree=1&assertion=1&points=10");
+ executeSuccess("date=2000-01-01&location=" + uniqueLoc + "&certify=1&rules=1&assertion=1&points=10");
String cookie = login(assurerM, TEST_PASSWORD);
URLConnection url = get(cookie, MyPoints.PATH);
String resp = IOUtils.readURL(url);
String cookie = login(assurerM, TEST_PASSWORD);
URLConnection url = get(cookie, MyPoints.PATH);
String resp = IOUtils.readURL(url);