Merge "Update notes about password security"

[gigi.git] / src / org / cacert / gigi / api / CATSImport.java

diff --git a/src/org/cacert/gigi/api/CATSImport.java b/src/org/cacert/gigi/api/CATSImport.java
index 507a4a000f0e822134f38a400e16dc0576960385..49960cd45387c2caf9cdced6d090cda761c35835 100644 (file)
--- a/src/org/cacert/gigi/api/CATSImport.java
+++ b/src/org/cacert/gigi/api/CATSImport.java
@@ -13,7 +13,7 @@ import org.cacert.gigi.dbObjects.User;
 
 public class CATSImport extends APIPoint {
 
-    public static final String PATH = "/cats_import";
+    public static final String PATH = "/cats/import";
 
     @Override
     public void process(HttpServletRequest req, HttpServletResponse resp, CertificateOwner u) throws IOException {
@@ -21,27 +21,39 @@ public class CATSImport extends APIPoint {
             resp.sendError(500, "Error, invalid cert");
             return;
         }
-        if ( !"CAcert".equals(((Organisation) u).getName())) {
+        if ( !((Organisation) u).isSelfOrganisation()) {
             resp.sendError(500, "Error, invalid cert");
             return;
 
         }
-        String target = req.getParameter("serial");
+        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;
         }
-        // TODO is "byEnabledSerial" desired?
-        CertificateOwner o = CertificateOwner.getByEnabledSerial(target);
+        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;
+        try {
+            id = Integer.parseInt(target);
+        } catch (NumberFormatException e) {
+            resp.sendError(500, "Error, requires mid to be integer.");
+            return;
+        }
+        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);
     }
 }