X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificateIssueForm.java;h=eecb31fe786a5e7373ee7445462af5e5446661c2;hb=d0ee991d9ba982e43acd036c2d0592976ba9e9ff;hp=8a3107f0ed5a03bd8ec582d98d9807fc1b6ec29c;hpb=9136e3e03b6881b32aada896be3241e46cbd33d9;p=gigi.git

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
index 8a3107f0..eecb31fe 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.java
@@ -4,8 +4,6 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.security.GeneralSecurityException;
 import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -15,14 +13,15 @@ import org.cacert.gigi.dbObjects.Certificate;
 import org.cacert.gigi.dbObjects.Certificate.SubjectAlternateName;
 import org.cacert.gigi.dbObjects.CertificateProfile;
 import org.cacert.gigi.dbObjects.Organisation;
-import org.cacert.gigi.dbObjects.User;
 import org.cacert.gigi.localisation.Language;
 import org.cacert.gigi.output.CertificateValiditySelector;
 import org.cacert.gigi.output.HashAlgorithms;
 import org.cacert.gigi.output.template.Form;
 import org.cacert.gigi.output.template.IterableDataset;
 import org.cacert.gigi.output.template.Template;
+import org.cacert.gigi.pages.LoginPage;
 import org.cacert.gigi.pages.Page;
+import org.cacert.gigi.util.AuthorizationContext;
 import org.cacert.gigi.util.RandomToken;
 
 /**
@@ -35,7 +34,7 @@ public class CertificateIssueForm extends Form {
 
     private final static Template tIni = new Template(CertificateAdd.class.getResource("RequestCertificate.templ"));
 
-    private User u;
+    private AuthorizationContext c;
 
     private String spkacChallenge;
 
@@ -43,7 +42,7 @@ public class CertificateIssueForm extends Form {
 
     public CertificateIssueForm(HttpServletRequest hsr) {
         super(hsr);
-        u = Page.getUser(hsr);
+        c = LoginPage.getAuthorizationContext(hsr);
         spkacChallenge = RandomToken.generateToken(16);
     }
 
@@ -64,10 +63,10 @@ public class CertificateIssueForm extends Form {
         try {
             try {
                 if (csr != null) {
-                    cr = new CertificateRequest(u, csr);
+                    cr = new CertificateRequest(c, csr);
                     cr.checkKeyStrength(out);
                 } else if (spkac != null) {
-                    cr = new CertificateRequest(u, spkac, spkacChallenge);
+                    cr = new CertificateRequest(c, spkac, spkacChallenge);
                     cr.checkKeyStrength(out);
                 } else if (cr != null) {
                     login = "1".equals(req.getParameter("login"));
@@ -76,13 +75,11 @@ public class CertificateIssueForm extends Form {
 
                     try {
                         cr.update(req.getParameter("CN"), req.getParameter("hash_alg"), req.getParameter("profile"), //
-                                req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs"), out, req);
+                                req.getParameter("org"), req.getParameter("OU"), req.getParameter("SANs"));
                     } catch (GigiApiException e) {
                         error.mergeInto(e);
                     }
-                    if (req.getParameter("CCA") == null) {
-                        error.mergeInto(new GigiApiException("You need to accept the CCA."));
-                    }
+
                     Certificate result = null;
                     try {
                         result = cr.draft();
@@ -93,7 +90,7 @@ public class CertificateIssueForm extends Form {
                         error.format(out, Page.getLanguage(req));
                         return false;
                     }
-                    result.issue(issueDate.getFrom(), issueDate.getTo()).waitFor(60000);
+                    result.issue(issueDate.getFrom(), issueDate.getTo(), c.getActor()).waitFor(60000);
                     this.result = result;
                     return true;
                 } else {
@@ -107,8 +104,6 @@ public class CertificateIssueForm extends Form {
             } catch (GeneralSecurityException e) {
                 e.printStackTrace();
                 throw new GigiApiException("Certificate Request format is invalid.");
-            } catch (InterruptedException e) {
-                e.printStackTrace();
             }
         } catch (GigiApiException e) {
             e.format(out, Page.getLanguage(req));
@@ -133,7 +128,6 @@ public class CertificateIssueForm extends Form {
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
         HashMap<String, Object> vars2 = new HashMap<String, Object>(vars);
-        vars2.put("CCA", "<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>");
 
         StringBuffer content = new StringBuffer();
         for (SubjectAlternateName SAN : cr.getSANs()) {
@@ -143,24 +137,30 @@ public class CertificateIssueForm extends Form {
             content.append('\n');
         }
 
-        vars2.put("CN", cr.getCN());
-        vars2.put("department", cr.getOu());
+        vars2.put("CN", cr.getName());
+        if (c.getTarget() instanceof Organisation) {
+            vars2.put("orga", "true");
+            vars2.put("department", cr.getOu());
+        }
         vars2.put("validity", issueDate);
         vars2.put("emails", content.toString());
         vars2.put("hashs", new HashAlgorithms(cr.getSelectedDigest()));
         vars2.put("profiles", new IterableDataset() {
 
-            int i = 1;
+            CertificateProfile[] cps = CertificateProfile.getAll();
+
+            int i = 0;
 
             @Override
             public boolean next(Language l, Map<String, Object> vars) {
                 CertificateProfile cp;
                 do {
-                    cp = CertificateProfile.getById(i++);
-                    if (cp == null) {
+                    if (i >= cps.length) {
                         return false;
                     }
-                } while ( !u.canIssue(cp));
+                    cp = cps[i];
+                    i++;
+                } while ( !cp.canBeIssuedBy(c.getTarget(), c.getActor()));
 
                 if (cp.getId() == cr.getProfile().getId()) {
                     vars.put("selected", " selected");
@@ -172,27 +172,6 @@ public class CertificateIssueForm extends Form {
                 return true;
             }
         });
-        final List<Organisation> orgs = u.getOrganisations();
-        vars2.put("orga", orgs.size() == 0 ? null : new IterableDataset() {
-
-            Iterator<Organisation> iter = orgs.iterator();
-
-            @Override
-            public boolean next(Language l, Map<String, Object> vars) {
-                if ( !iter.hasNext()) {
-                    return false;
-                }
-                Organisation orga = iter.next();
-                vars.put("key", orga.getId());
-                vars.put("name", orga.getName());
-                if (orga == cr.getOrg()) {
-                    vars.put("selected", " selected");
-                } else {
-                    vars.put("selected", "");
-                }
-                return true;
-            }
-        });
 
         t.output(out, l, vars2);
     }