UPD: moved getUser up

diff --git a/src/org/cacert/gigi/pages/Page.java b/src/org/cacert/gigi/pages/Page.java
index 320107f84868c408467ec72d0fefa519afdc6536..a1309c9f74e497aaf077efe9c5dfb2580ecc5eb0 100644 (file)
--- a/src/org/cacert/gigi/pages/Page.java
+++ b/src/org/cacert/gigi/pages/Page.java
@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.Language;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.Language;

+import org.cacert.gigi.User;

 import org.cacert.gigi.output.template.Template;
 
 /**
 import org.cacert.gigi.output.template.Template;
 
 /**


@@ -110,4 +111,8 @@ public abstract class Page {
         return l.getTranslation(string);
     }
 
         return l.getTranslation(string);
     }
 

+    public static User getUser(HttpServletRequest req) {
+        return LoginPage.getUser(req);
+    }
+

 }
 }

diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
index 805c72d923958c0297e28134640d4d5dd1942482..c17f2d8d652354d28c60b1580565e659d16c220d 100644 (file)
--- a/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordPage.java
@@ -7,7 +7,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.output.Form;
 import javax.servlet.http.HttpServletResponse;
 
 import org.cacert.gigi.output.Form;

-import org.cacert.gigi.pages.LoginPage;

 import org.cacert.gigi.pages.Page;
 
 public class ChangePasswordPage extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class ChangePasswordPage extends Page {


@@ -20,7 +19,7 @@ public class ChangePasswordPage extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {

-        new ChangeForm(req, LoginPage.getUser(req)).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+        new ChangeForm(req, getUser(req)).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());

     }
 
     @Override
     }
 
     @Override

diff --git a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
index 0643f4855eac6024f698909a431677132cef020c..cf10c612fdcc61a1efa9525005e89a3c13ca90dd 100644 (file)
--- a/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
+++ b/src/org/cacert/gigi/pages/account/IssueCertificateForm.java
@@ -15,12 +15,12 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Certificate;
 import javax.servlet.http.HttpServletRequest;
 
 import org.cacert.gigi.Certificate;

+import org.cacert.gigi.Certificate.CSRType;

 import org.cacert.gigi.Digest;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.Digest;
 import org.cacert.gigi.EmailAddress;
 import org.cacert.gigi.GigiApiException;
 import org.cacert.gigi.Language;
 import org.cacert.gigi.User;

-import org.cacert.gigi.Certificate.CSRType;

 import org.cacert.gigi.crypto.SPKAC;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.HashAlgorithms;
 import org.cacert.gigi.crypto.SPKAC;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.HashAlgorithms;


@@ -58,7 +58,7 @@ public class IssueCertificateForm extends Form {
 
     public IssueCertificateForm(HttpServletRequest hsr) {
         super(hsr);
 
     public IssueCertificateForm(HttpServletRequest hsr) {
         super(hsr);

-        u = LoginPage.getUser(hsr);
+        u = Page.getUser(hsr);

         spkacChallange = RandomToken.generateToken(16);
     }
 
         spkacChallange = RandomToken.generateToken(16);
     }
 

diff --git a/src/org/cacert/gigi/pages/account/MailCertificates.java b/src/org/cacert/gigi/pages/account/MailCertificates.java
index b725dda076bc7c6a893f2c79bc58bda09ae56d31..ed8661708464bff6696e5b469688fefd9b2e7dfa 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailCertificates.java
+++ b/src/org/cacert/gigi/pages/account/MailCertificates.java
@@ -58,7 +58,7 @@ public class MailCertificates extends Page {
         String serial = pi;
         try {
             Certificate c = Certificate.getBySerial(serial);
         String serial = pi;
         try {
             Certificate c = Certificate.getBySerial(serial);

-            if (c == null || LoginPage.getUser(req).getId() != c.getOwnerId()) {
+            if (c == null || getUser(req).getId() != c.getOwnerId()) {

                 resp.sendError(404);
                 return true;
             }
                 resp.sendError(404);
                 return true;
             }

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index 9ce150f820810967d5c5e4d38a5c0fbffef245c1..7836867877245228addd832185487ee72d55c748 100644 (file)
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -13,7 +13,6 @@ import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Outputable;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.Outputable;

-import org.cacert.gigi.pages.LoginPage;

 import org.cacert.gigi.pages.Page;
 
 public class MailOverview extends Page {
 import org.cacert.gigi.pages.Page;
 
 public class MailOverview extends Page {


@@ -29,7 +28,7 @@ public class MailOverview extends Page {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 
     @Override
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {

-        final User us = LoginPage.getUser(req);
+        final User us = getUser(req);

         Language lang = Page.getLanguage(req);
         HashMap<String, Object> vars = new HashMap<>();
         vars.put("mailData", t);
         Language lang = Page.getLanguage(req);
         HashMap<String, Object> vars = new HashMap<>();
         vars.put("mailData", t);

diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.java b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
index 97dac246456fce9a9b48294281a8e8f4dd0b166c..6e51ae9763b6426ce01a13be5d331a8a42b34a30 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.java
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.java
@@ -14,7 +14,7 @@ import org.cacert.gigi.Language;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;
 import org.cacert.gigi.User;
 import org.cacert.gigi.output.Form;
 import org.cacert.gigi.output.template.Template;

-import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.Page;

 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.Notary.AssuranceResult;
 
 import org.cacert.gigi.util.Notary;
 import org.cacert.gigi.util.Notary.AssuranceResult;
 


@@ -92,7 +92,7 @@ public class AssuranceForm extends Form {
             return false;
         }
         try {
             return false;
         }
         try {

-            AssuranceResult success = Notary.assure(LoginPage.getUser(req), assuree, Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));
+            AssuranceResult success = Notary.assure(Page.getUser(req), assuree, Integer.parseInt(req.getParameter("points")), req.getParameter("location"), req.getParameter("date"));

             if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
                 outputError(out, req, success.getMessage());
             }
             if (success != AssuranceResult.ASSURANCE_SUCCEDED) {
                 outputError(out, req, success.getMessage());
             }

diff --git a/src/org/cacert/gigi/pages/wot/AssurePage.java b/src/org/cacert/gigi/pages/wot/AssurePage.java
index 1dae379c18a7d69cebb9438b6f402e50a016d52d..0e9bc4196354848c487f3219dfed546c9af7b5ad 100644 (file)
--- a/src/org/cacert/gigi/pages/wot/AssurePage.java
+++ b/src/org/cacert/gigi/pages/wot/AssurePage.java
@@ -70,7 +70,7 @@ public class AssurePage extends Page {
         PrintWriter out = resp.getWriter();
         String pi = req.getPathInfo().substring(PATH.length());
         if (pi.length() > 1) {
         PrintWriter out = resp.getWriter();
         String pi = req.getPathInfo().substring(PATH.length());
         if (pi.length() > 1) {

-            User myself = LoginPage.getUser(req);
+            User myself = getUser(req);

             int mid = Integer.parseInt(pi.substring(1));
             if (mid == myself.getId()) {
                 out.println(translate(req, "Cannot assure myself."));
             int mid = Integer.parseInt(pi.substring(1));
             if (mid == myself.getId()) {
                 out.println(translate(req, "Cannot assure myself."));