import org.cacert.gigi.dbObjects.CATS;
import org.cacert.gigi.dbObjects.CertificateOwner;
-import org.cacert.gigi.dbObjects.Organisation;
import org.cacert.gigi.dbObjects.User;
-public class CATSImport extends APIPoint {
+public class CATSImport extends CATSRestrictedApi {
public static final String PATH = "/cats/import";
@Override
- public void process(HttpServletRequest req, HttpServletResponse resp, CertificateOwner u) throws IOException {
- if ( !(u instanceof Organisation)) {
- resp.sendError(500, "Error, invalid cert");
- return;
- }
- if ( !((Organisation) u).isSelfOrganisation()) {
- resp.sendError(500, "Error, invalid cert");
- return;
-
- }
+ public void processAuthenticated(HttpServletRequest req, HttpServletResponse resp) throws IOException {
String target = req.getParameter("mid");
String testType = req.getParameter("variant");
String date = req.getParameter("date");
if (target == null || testType == null || date == null) {
- resp.sendError(500, "Error, requires serial, variant and date");
+ resp.sendError(500, "Error, requires mid, variant and date");
+ return;
+ }
+ String language = req.getParameter("language");
+ String version = req.getParameter("version");
+ if (language == null || version == null) {
+ resp.sendError(500, "Error, requires also language and version");
return;
}
int id;
}
CertificateOwner o = CertificateOwner.getById(id);
if ( !(o instanceof User)) {
- resp.sendError(500, "Error, requires valid serial");
+ resp.sendError(500, "Error, requires valid userid");
return;
}
System.out.println("CATS: " + target + ": " + testType);
User targetUser = (User) o;
System.out.println(targetUser.getId());
- CATS.enterResult(targetUser, testType, new Date(Long.parseLong(date)));
+ CATS.enterResult(targetUser, testType, new Date(Long.parseLong(date)), language, version);
}
}