import org.cacert.gigi.dbObjects.User;
import org.cacert.gigi.localisation.Language;
import org.cacert.gigi.output.template.Form;
+import org.cacert.gigi.util.AuthorizationContext;
import org.cacert.gigi.util.PasswordHash;
+import org.cacert.gigi.util.ServerConstants;
public class LoginPage extends Page {
@Override
public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
- new LoginForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+ if (req.getHeader("Host").equals(ServerConstants.getSecureHostNamePort())) {
+ resp.getWriter().println(getLanguage(req).getTranslation("Authentication with certificate failed. Try another certificate or use a password."));
+ } else {
+ new LoginForm(req).output(resp.getWriter(), getLanguage(req), new HashMap<String, Object>());
+ }
}
@Override
}
public static User getUser(HttpServletRequest req) {
- return (User) req.getSession().getAttribute(USER);
+ AuthorizationContext ac = getAuthorizationContext(req);
+ if (ac == null) {
+ return null;
+ }
+ return ac.getActor();
+ }
+
+ public static AuthorizationContext getAuthorizationContext(HttpServletRequest req) {
+ return ((AuthorizationContext) req.getSession().getAttribute(AUTH_CONTEXT));
}
private void tryAuthWithCertificate(HttpServletRequest req, X509Certificate x509Certificate) {
HttpSession hs = req.getSession();
hs.setAttribute(LOGGEDIN, true);
hs.setAttribute(Language.SESSION_ATTRIB_NAME, user.getPreferredLocale());
- hs.setAttribute(USER, user);
+ hs.setAttribute(AUTH_CONTEXT, new AuthorizationContext(user, user));
}
@Override
- public boolean isPermitted(User u) {
- return u == null;
+ public boolean isPermitted(AuthorizationContext ac) {
+ return ac == null;
}
}