Skip to content

Commit 60099a4

Browse files
committed
Set secure session cookies when redirecting from HTTP to HTTPS.
So far for session cookies the secure property was only set when no HTTP port was opened. This changes to also set it when HTTP is redirected to the HTTPS port.
1 parent 90a8d1a commit 60099a4

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/main/java/com/gitblit/GitBlitServer.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,8 @@ public void log(String message) {
375375
HashSessionManager sessionManager = new HashSessionManager();
376376
sessionManager.setHttpOnly(true);
377377
// Use secure cookies if only serving https
378-
sessionManager.setSecureRequestOnly(params.port <= 0 && params.securePort > 0);
378+
sessionManager.setSecureRequestOnly( (params.port <= 0 && params.securePort > 0) ||
379+
(params.port > 0 && params.securePort > 0 && settings.getBoolean(Keys.server.redirectToHttpsPort, true)) );
379380
rootContext.getSessionHandler().setSessionManager(sessionManager);
380381

381382
// Ensure there is a defined User Service

0 commit comments

Comments
 (0)