summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmo Haataja <ismo.haataja@digia.com>2014-04-17 09:52:24 +0300
committerIsmo Haataja <ismo.haataja@digia.com>2014-06-03 14:53:38 +0200
commit68e3eeed35ec73d57876621b8c3514b649e93362 (patch)
treeb8ccba6a5113521911852591ac3a6177f53007ca
parent9a629f43092f376fcf9eb1181a009bcf0bec0340 (diff)
Fixed gerrit email verification link requires insecure login
When registering a new email address with gerrit, it sends an email with a verification link. This link now uses 'https:' schema instead of 'http:'. Task-number: QTQAINFRA-167 Originally-by: Peter Heubeck <peter.heubeck@tieto.com> Change-Id: I0e2e5a88171d6d6519149f5a2c2248810436c156 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Ismo Haataja <ismo.haataja@digia.com>
-rw-r--r--gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
index eb32700c50..4394c0bd2e 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/RegisterNewEmailSender.java
@@ -1,4 +1,5 @@
// Copyright (C) 2009 The Android Open Source Project
+// Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -57,6 +58,15 @@ public class RegisterNewEmailSender extends OutgoingEmail {
appendText(velocifyFile("RegisterNewEmail.vm"));
}
+ @Override
+ public String getGerritUrl() {
+ String url = args.urlProvider.get();
+ if (url.startsWith("http:")) {
+ url = "https:" + url.substring(5);
+ }
+ return url;
+ }
+
public String getUserNameEmail() {
String name = user.getAccount().getFullName();
String email = user.getAccount().getPreferredEmail();