summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit/Constants.java
diff options
context:
space:
mode:
authorJames Moger <james.moger@gmail.com>2015-12-10 09:55:23 -0500
committerJames Moger <james.moger@gmail.com>2015-12-10 09:55:23 -0500
commit7b7b0d54b606e5a7d63ea39ec8918968f612d61d (patch)
treece2e6e349123a59cb04957eb1dcaa6d170952c51 /src/main/java/com/gitblit/Constants.java
parent280c0c041ed830a4d5874b60adf1b72760326c6a (diff)
parentfd0fc5fc9a13456c4038d03cbc6c6b3beed38910 (diff)
downloadgitblit-7b7b0d54b606e5a7d63ea39ec8918968f612d61d.tar.gz
gitblit-7b7b0d54b606e5a7d63ea39ec8918968f612d61d.zip
Merge pull request #980 from mrjoel/mrjoel-httpheaders
Refactor authentication for servlet HTTP header handler
Diffstat (limited to 'src/main/java/com/gitblit/Constants.java')
-rw-r--r--src/main/java/com/gitblit/Constants.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/Constants.java b/src/main/java/com/gitblit/Constants.java
index 4aa8c0ca..0a99953a 100644
--- a/src/main/java/com/gitblit/Constants.java
+++ b/src/main/java/com/gitblit/Constants.java
@@ -574,7 +574,7 @@ public class Constants {
}
public static enum AuthenticationType {
- PUBLIC_KEY, CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER;
+ PUBLIC_KEY, CREDENTIALS, COOKIE, CERTIFICATE, CONTAINER, HTTPHEADER;
public boolean isStandard() {
return ordinal() <= COOKIE.ordinal();
@@ -582,7 +582,7 @@ public class Constants {
}
public static enum AccountType {
- LOCAL, EXTERNAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD;
+ LOCAL, CONTAINER, LDAP, REDMINE, SALESFORCE, WINDOWS, PAM, HTPASSWD, HTTPHEADER;
public static AccountType fromString(String value) {
for (AccountType type : AccountType.values()) {