summaryrefslogtreecommitdiffstats
path: root/src/main/java/com/gitblit
diff options
context:
space:
mode:
authorFlorian Zschocke <f.zschocke+git@gmail.com>2022-08-14 14:10:09 +0200
committerFlorian Zschocke <f.zschocke+git@gmail.com>2022-08-14 14:10:09 +0200
commit1df20a06c93ac68203f10d89f025d6ee74f5f23b (patch)
tree740d594e512d4494b5409c6d55de610753876ef2 /src/main/java/com/gitblit
parentf1a20ea57d20735e54507ddb8cc7197b20030da9 (diff)
parent7a0639b514cff77fe5b149b16a6eb8f1f216443b (diff)
downloadgitblit-1df20a06c93ac68203f10d89f025d6ee74f5f23b.tar.gz
gitblit-1df20a06c93ac68203f10d89f025d6ee74f5f23b.zip
Merge branch 'disable-client-certs' of github.com:oddeirik/gitblit into oddeirik-disable-client-certs
Diffstat (limited to 'src/main/java/com/gitblit')
-rw-r--r--src/main/java/com/gitblit/GitBlitServer.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/GitBlitServer.java b/src/main/java/com/gitblit/GitBlitServer.java
index 06000f53..190cc5d2 100644
--- a/src/main/java/com/gitblit/GitBlitServer.java
+++ b/src/main/java/com/gitblit/GitBlitServer.java
@@ -292,7 +292,7 @@ public class GitBlitServer {
if (params.requireClientCertificates) {
factory.setNeedClientAuth(true);
} else {
- factory.setWantClientAuth(true);
+ factory.setWantClientAuth((params.wantClientCertificates));
}
ServerConnector connector = new ServerConnector(server, factory);
@@ -602,6 +602,9 @@ public class GitBlitServer {
@Option(name = "--requireClientCertificates", usage = "Require client X509 certificates for https connections.")
public Boolean requireClientCertificates = FILESETTINGS.getBoolean(Keys.server.requireClientCertificates, false);
+ @Option(name = "--wantClientCertificates", usage = "Ask for optional client X509 certificate for https connections. Ignored if client certificates are required.")
+ public Boolean wantClientCertificates = FILESETTINGS.getBoolean(Keys.server.wantClientCertificates, false);
+
/*
* Setting overrides
*/