import org.cacert.gigi.output.PageMenuItem;
import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
+import org.cacert.gigi.pages.LogoutPage;
import org.cacert.gigi.pages.MainPage;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.pages.StaticPage;
putPage("/login", new LoginPage("CAcert - Login"), "Join CAcert.org");
putPage("/", new MainPage("CAcert - Home"), null);
putPage(ChangePasswordPage.PATH, new ChangePasswordPage(), "My Account");
+ putPage(LogoutPage.PATH, new LogoutPage("Logout"), "My Account");
putPage("/secure", new TestSecure(), null);
putPage(Verify.PATH, new Verify(), null);
putPage(AssurePage.PATH + "/*", new AssurePage(), "CAcert Web of Trust");
// return;
// }
HttpSession hs = req.getSession();
- if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) {
- if (hs != null) {
- hs.setAttribute(LOGGEDIN, null);
- hs.invalidate();
- }
- resp.sendRedirect("/");
- return;
- }
final Page p = getPage(req.getPathInfo());
if (p != null) {
--- /dev/null
+package org.cacert.gigi.pages;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.cacert.gigi.Gigi;
+import org.cacert.gigi.User;
+
+public class LogoutPage extends Page {
+
+ public static final String PATH = "/logout";
+
+ public LogoutPage(String title) {
+ super(title);
+ }
+
+ @Override
+ public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+ HttpSession hs = req.getSession();
+ if (req.getPathInfo() != null && req.getPathInfo().equals("/logout")) {
+ if (hs != null) {
+ hs.setAttribute(Gigi.LOGGEDIN, null);
+ hs.invalidate();
+ }
+ resp.sendRedirect("/");
+ return;
+ }
+ }
+
+ @Override
+ public boolean isPermitted(User u) {
+ return u != null;
+ }
+
+}