From: Felix Dörre <felix@dogcraft.de>
Date: Thu, 3 Jul 2014 19:31:01 +0000 (+0200)
Subject: Relocate static images and tighten Content-Policy
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=c340139d6370117bbf7fb5172ca9dd8ac6e40828

Relocate static images and tighten Content-Policy
---

diff --git a/src/org/cacert/gigi/Gigi.java b/src/org/cacert/gigi/Gigi.java
index 4b6b3826..b6aa90eb 100644
--- a/src/org/cacert/gigi/Gigi.java
+++ b/src/org/cacert/gigi/Gigi.java
@@ -151,7 +151,7 @@ public class Gigi extends HttpServlet {
 		hsr.addHeader("Access-Control-Max-Age", "60");
 		hsr.addHeader("Content-Security-Policy", "default-src 'self' https://"
 				+ ServerConstants.getStaticHostNamePort()
-				+ " https://www.cacert.org/*;frame-ancestors 'none'");
+				+ ";frame-ancestors 'none'");
 		// ;report-uri https://felix.dogcraft.de/report.php
 
 	}
diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index ae226ec2..95d17860 100644
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -10,7 +10,7 @@
 		<div id="pageName">
 			<br>
 			<div id="pageLogo">
-				<a href="/"><img src="https://www.cacert.org/images/cacert4.png"
+				<a href="/"><img src="https://<?=$static?>/images/cacert4.png"
 					alt="CAcert.org logo"></a>
 			</div>
 			<div id="googlead">
@@ -90,23 +90,23 @@
 		<div class="sponsorinfo">
 			Der CAcert-Betrieb wird gesponsert von
 			<a href="http://www.bit.nl/" target="_blank">
-				<img class="sponsorlogo" src="https://www.cacert.org/images/bit.png" alt="[BIT logo]">
+				<img class="sponsorlogo" src="https://<?=$static?>/images/bit.png" alt="[BIT logo]">
 			</a>
 			<a href="http://www.tunix.nl/" target="_blank">
-				<img class="sponsorlogo" src="https://www.cacert.org/images/tunix.png" alt="[TUNIX logo]">
+				<img class="sponsorlogo" src="https://<?=$static?>/images/tunix.png" alt="[TUNIX logo]">
 			</a>
 			<a href="http://www.nlnet.nl/" target="_blank">
-				<img class="sponsorlogo" src="https://www.cacert.org/images/nlnet.png" alt="[NLnet logo]">
+				<img class="sponsorlogo" src="https://<?=$static?>/images/nlnet.png" alt="[NLnet logo]">
 			</a>
 			<a href="http://www.openarchitecturenetwork.org/" target="_blank">
-				<img class="sponsorlogo" src="https://www.cacert.org/images/oan.png" alt="[OAN logo]">
+				<img class="sponsorlogo" src="https://<?=$static?>/images/oan.png" alt="[OAN logo]">
 			</a>
 		</div>
 
 		<div id="siteInfo">
 			<a href="//wiki.cacert.org/FAQ/AboutUs">Über uns</a> |
 			<a href="/index.php?id=13">Spenden</a> |
-			<a href="http://wiki.cacert.org/wiki/CAcertIncorporated">Vereins-Mitgliedschaft</a> |
+			<a href="//wiki.cacert.org/wiki/CAcertIncorporated">Vereins-Mitgliedschaft</a> |
 			<a href="/policy/PrivacyPolicy.html">Datenschutzrichtlinien</a> |
 			<a href="/index.php?id=51">Unsere Ziele</a> |
 			<a href="/index.php?id=11">Kontakt</a> |
diff --git a/static/static/images/bit.png b/static/static/images/bit.png
new file mode 100644
index 00000000..5597e3b5
Binary files /dev/null and b/static/static/images/bit.png differ
diff --git a/static/static/images/cacert4.png b/static/static/images/cacert4.png
new file mode 100644
index 00000000..e4650a09
Binary files /dev/null and b/static/static/images/cacert4.png differ
diff --git a/static/static/images/nlnet.png b/static/static/images/nlnet.png
new file mode 100644
index 00000000..c7e5c465
Binary files /dev/null and b/static/static/images/nlnet.png differ
diff --git a/static/static/images/oan.png b/static/static/images/oan.png
new file mode 100644
index 00000000..548bb126
Binary files /dev/null and b/static/static/images/oan.png differ
diff --git a/static/static/images/tunix.png b/static/static/images/tunix.png
new file mode 100644
index 00000000..29adb60a
Binary files /dev/null and b/static/static/images/tunix.png differ