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;
public class LoginPage extends Page {
}
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) {
}
public static User fetchUserBySerial(String serial) {
+ if ( !serial.matches("[A-Fa-f0-9]+")) {
+ throw new Error("serial malformed.");
+ }
GigiPreparedStatement ps = DatabaseConnection.getInstance().prepare("SELECT `memid` FROM `certs` WHERE `serial`=? AND `disablelogin`='0' AND `revoked` is NULL");
- ps.setString(1, serial);
+ ps.setString(1, serial.toLowerCase());
GigiResultSet rs = ps.executeQuery();
User user = null;
if (rs.next()) {
user = User.getById(rs.getInt(1));
+ } else {
+ System.out.println("User with serial " + serial + " not found.");
}
rs.close();
return user;
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;
}
}