private Date dob;
+ private String location = "";
+
+ private String date = "";
+
private static final Template templ;
static {
templ = new Template(AssuranceForm.class.getResource("AssuranceForm.templ"));
res.put("maxpoints", assuree.getMaxAssurePoints());
res.put("dob", sdf.format(assuree.getDoB()));
res.put("dobFmt2", sdf2.format(assuree.getDoB()));
+ res.put("location", location);
+ res.put("date", date);
templ.output(out, l, res);
}
@Override
public boolean submit(PrintWriter out, HttpServletRequest req) {
+ location = req.getParameter("location");
+ date = req.getParameter("date");
+ if (date == null || location == null) {
+ outputError(out, req, "You need to enter location and date!");
+ }
+
if ( !"1".equals(req.getParameter("certify")) || !"1".equals(req.getParameter("rules")) || !"1".equals(req.getParameter("CCAAgreed")) || !"1".equals(req.getParameter("assertion"))) {
outputError(out, req, "You failed to check all boxes to validate" + " your adherence to the rules and policies of CAcert");
return false;
}
try {
- Notary.assure(Page.getUser(req), assuree, assureeName, dob, pointsI, req.getParameter("location"), req.getParameter("date"));
+ Notary.assure(Page.getUser(req), assuree, assureeName, dob, pointsI, location, req.getParameter("date"));
return true;
} catch (GigiApiException e) {
e.format(out, Page.getLanguage(req));
</tr>
<tr>
<td><?=_Location?></td>
- <td><input type="text" name="location"></td>
+ <td><input type="text" name="location" value="<?=$location?>"></td>
</tr>
<tr>
<td><?=_Date?></td>
- <td><input type="text" name="date"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
+ <td><input type="text" name="date" value="<?=$date?>"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
</tr>
<tr>
<td><input type="checkbox" name="assertion" value="1"></td>
assertNull(error);
}
+ @Test
+ public void testAssureFormContanisData() throws IOException {
+ URLConnection uc = buildupAssureFormConnection(true);
+ uc.getOutputStream().write(("date=2000-01-01&location=testcase&rules=1&CCAAgreed=1&assertion=1&points=10").getBytes("UTF-8"));
+ uc.getOutputStream().flush();
+ String data = IOUtils.readURL(uc);
+ assertThat(data, containsString("2000-01-01"));
+ assertThat(data, containsString("testcase"));
+ }
+
@Test
public void testAssureFormNoCSRF() throws IOException {
// override csrf