From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 26 Oct 2017 14:05:05 +0000 (+0100)
Subject: mirrors: Use HTTPS when the mirror server supports it
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=10cdef58ac57b6667dbba3c05a5c487c597191b4;p=ipfire.org.git

mirrors: Use HTTPS when the mirror server supports it

Fixes #11530

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/webapp/backend/mirrors.py b/webapp/backend/mirrors.py
index 9869dc0c..042c0b61 100644
--- a/webapp/backend/mirrors.py
+++ b/webapp/backend/mirrors.py
@@ -312,7 +312,7 @@ class Mirror(Object):
 		return ret
 
 	def generate_url(self):
-		url = "http://%s" % self.hostname
+		url = "%s://%s" % ("https" if self.supports_https else "http", self.hostname)
 		if not self.path.startswith("/"):
 			url += "/"
 		url += "%s" % self.path
@@ -328,6 +328,10 @@ class Mirror(Object):
 	def path(self):
 		return self._info.path
 
+        @property
+        def supports_https(self):
+                return self._info.supports_https
+
 	@property
 	def address(self):
 		for addr in self.addresses4: