add: ensure org ra agents cannot manage org where they are org admin

[gigi.git] / src / club / wpia / gigi / api / FindAgent.java

diff --git a/src/club/wpia/gigi/api/FindAgent.java b/src/club/wpia/gigi/api/FindAgent.java
index bb2a57823edf0fbf5f499530568a07c6a3ff7295..d37ccbb73b0455cc7d4da87a02d1f3407b6e7112 100644 (file)
--- a/src/club/wpia/gigi/api/FindAgent.java
+++ b/src/club/wpia/gigi/api/FindAgent.java
@@ -2,6 +2,7 @@ package club.wpia.gigi.api;
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.math.BigInteger;
 import java.util.HashMap;
 
 import javax.servlet.http.HttpServletRequest;
@@ -17,6 +18,7 @@ import club.wpia.gigi.dbObjects.User;
 import club.wpia.gigi.email.EmailProvider;
 import club.wpia.gigi.pages.account.FindAgentAccess;
 import club.wpia.gigi.util.ServerConstants;
+import club.wpia.gigi.util.ServerConstants.Host;
 
 public class FindAgent extends APIPoint {
 
@@ -48,11 +50,11 @@ public class FindAgent extends APIPoint {
         String pi = req.getPathInfo();
         if (pi.equals(PATH_RESOLVE)) {
             String serial = req.getParameter("serial");
-            if (serial == null) {
+            if (serial == null || serial.isEmpty()) {
                 resp.sendError(500, "Error, requires serial");
                 return;
             }
-            Certificate c = Certificate.getBySerial(serial);
+            Certificate c = Certificate.getBySerial(new BigInteger(serial, 16));
             if (c == null) {
                 resp.sendError(500, "Error, requires serial");
                 return;
@@ -66,7 +68,7 @@ public class FindAgent extends APIPoint {
             if ( !us.isInGroup(Group.LOCATE_AGENT)) {
                 resp.setStatus(501);
                 resp.setContentType("text/plain; charset=UTF-8");
-                resp.getWriter().println("https://" + ServerConstants.getSecureHostNamePortSecure() + FindAgentAccess.PATH);
+                resp.getWriter().println("https://" + ServerConstants.getHostNamePortSecure(Host.SECURE) + FindAgentAccess.PATH);
                 return;
             }
             resp.setContentType("text/plain; charset=UTF-8");
@@ -87,8 +89,8 @@ public class FindAgent extends APIPoint {
                 jw.key("id");
                 jw.value(u1.getId());
 
-                jw.key("canAssure");
-                jw.value(u1.canAssure());
+                jw.key("canVerify");
+                jw.value(u1.canVerify());
 
                 jw.key("name");
                 jw.value(u1.getPreferredName().toAbbreviatedString());