Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add formstack to frame-ancestors CSP #1532

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Add formstack to frame-ancestors CSP #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
212f394
Pared down version of page for embedding
scottmakestech Jun 1, 2023
a8704af
add Source sans font
scottmakestech Jun 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 0 additions & 83 deletions layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,83 +0,0 @@
{{ if and (ne .Section "docs") (ne .Section "documents") (not .Params.no_donate_footer) }}
<div class="donate-footer">
<div class="wrapper text-center">
<h2>{{ i18n "footer_support_us" }}</h2>
<div class="buttons">
<a class="accent" href="{{ "donate/" | relLangURL }}">{{ i18n "footer_donate" }}</a>
</div>
</div>
</div>
{{ end }}

{{ if ne .Section "documents" }}
<footer class="site-footer">

<div class="wrapper">
<div class="footer-col-wrapper">
<div class="footer-col footer-col-2">
<p>{{ .Site.Params.description | safeHTML }}</p>
<p>
<span itemscope itemtype="http://schema.org/PostalAddress">
<span itemprop="streetAddress">548 Market St, PMB 77519</span>,
<span itemprop="addressLocality">San Francisco</span>,
<span itemprop="addressRegion">CA</span>
<span itemprop="postalCode">94104-5401</span>,
<span itemprop="addressCountry">USA</span>
</span>
</p>
<p>{{ i18n "footer_mailing" }}</p>
<p>
<span itemscope itemtype="http://schema.org/PostalAddress">
<span itemprop="streetAddress">PO Box 18666</span>,
<span itemprop="addressLocality">Minneapolis</span>,
<span itemprop="addressRegion">MN</span>
<span itemprop="postalCode">55418-0666</span>,
<span itemprop="addressCountry">USA</span>
</span>
</p>
</div>

<div class="footer-col footer-col-1">
<ul class="social-media-list">
{{ with .Site.Params.github_username }}
<li>
<i class="fab fa-github" aria-hidden="true"></i>
<a href="https://github.com/{{ . }}">
<span class="username">GitHub</span>
</a>
</li>
{{ end }}

{{ with .Site.Params.twitter_username }}
<li>
<i class="fab fa-twitter" aria-hidden="true"></i>
<a href="https://twitter.com/{{ . }}">
<span class="username">Twitter</span>
</a>
</li>
{{ end }}
{{ with .Site.Params.mastodon_username }}
<li>
<i class="fab fa-mastodon" aria-hidden="true"></i>
<a rel="me" href="https://infosec.exchange/@{{ . }}">
<span class="username">Mastodon</span>
</a>
</li>
{{ end }}
</ul>
{{ i18n "footer_policies" | safeHTML }}
</div>

<div class="footer-col footer-newsletter-col footer-col-3">
<h6>{{ i18n "subscribe_to_newsletter_headline" }}</h6>
<iframe src="https://outreach.abetterinternet.org/l/1011011/2023-02-16/6l51" height="200" style="width: 100%; border: 0"></iframe>
</div>
</div>

</div>

</footer>
{{ end }}{{/* if ne .Section "documents" */}}

{{ $js := resources.Get "js/main.js" | fingerprint "sha512" }}
<script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}"></script>
23 changes: 0 additions & 23 deletions layouts/partials/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,5 @@
<meta name="viewport" content="width=device-width initial-scale=1" />
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>{{ if ne .Title .Site.Title }}{{ .Title }} - {{ end }} {{ .Site.Title }}</title>
<meta name="description" content="{{ with .Description }}{{ . | plainify }}{{ else }}{{if .IsPage}}{{ .Summary | plainify }}{{ else }}{{ with .Site.Params.description }}{{ . | plainify }}{{ end }}{{ end }}{{ end -}}">
<meta name="twitter:card" content="summary">
<meta name="twitter:site" content="@letsencrypt">
<meta name="twitter:title" content="{{ .Title }}">
<meta name="twitter:url" content="{{ .Permalink }}">
<meta name="twitter:description" content="{{ with .Description }}{{ . | plainify }}{{ else }}{{if .IsPage}}{{ .Summary | plainify }}{{ else }}{{ with .Site.Params.description }}{{ . | plainify }}{{ end }}{{ end }}{{ end -}}">
<meta name="twitter:image:src" content="{{ "images/le-logo-twitter-noalpha.png" | absURL }}">
<meta name="og:image" content="{{ "images/LetsEncrypt-SocialShare.png" | absURL }}">

{{ $style := resources.Get "css/main.scss" | resources.ToCSS | minify | fingerprint "sha512" }}
<link rel="stylesheet" href="{{ $style.RelPermalink }}" integrity="{{ $style.Data.Integrity }}">

<link rel="stylesheet" href="/fontawesome-free-5.12.1-web/css/all.min.css" />
{{ if .Params.canonicalUrl }}
<link rel="canonical" href="{{ .Params.canonicalUrl }}">
{{ else }}
<link rel="canonical" href="{{ .RelPermalink }}">
{{ end }}
{{ with .Site.Home.OutputFormats.Get "RSS" -}}
<link rel="alternate" href="/feed.xml" type="application/rss+xml" title="{{ i18n "blog_feed" }}" />
{{ end }}
{{ if .Page.Params.do_not_index }}
<meta name="robots" content="noindex">
{{ end }}
</head>
68 changes: 8 additions & 60 deletions layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,8 @@
{{ if ne .Section "documents" }}
<header class="site-header">
<a id="skiplink" href="#main-content">{{ i18n "header_skip_nav" }}</a>
<div class="wrapper">
<a class="site-title" href="{{ .Site.Home.RelPermalink }}"><img src="/images/letsencrypt-logo-horizontal.svg" alt="Let's Encrypt"></a>

<span id="menuIcon">
<i class="fas fa-bars"></i>
</span>
<nav class="site-nav" id="menu">
<div class="pure-menu pure-menu-horizontal custom-can-transform">
<ul class="pure-menu-list">
{{ range .Site.Menus.main }}
<li class="pure-menu-item{{ if .HasChildren }} pure-menu-has-children{{ end }}">
<a href="{{ if .HasChildren }}#{{ else }}{{ .URL }}{{ end }}" class="pure-menu-link" tabindex="0">{{ .Name }}</a>
{{ if .HasChildren }}
<ul class="pure-menu-children">
{{ range .Children }}
<li class="pure-menu-item">
<a href="{{ .URL }}" class="pure-menu-link">{{ .Name }}</a>
</li>
{{ end }}
</ul>
{{ end }}
</li>
{{ end }}
{{ $home := .Site.Home }}
{{ $langs := slice }}
{{ if .Translations }}
{{ range .AllTranslations }}
{{ $langs = $langs | append . }}
{{ end }}
{{ else }}
{{ range $home.AllTranslations }}
{{ $langs = $langs | append . }}
{{ end }}
{{ end }}
{{ if gt (len $langs ) 1 }}
<li class="pure-menu-item pure-menu-has-children">
<a href="#" class="pure-menu-link" tabindex="0">{{ i18n "languages" }} <img src="/images/language-icon128px-black.png" class="inline-icon" alt="" aria-hidden="true"></a>
<ul class="pure-menu-children menu-for-languages">
{{ range $langs }}
{{ $isCurrentLang := eq $home.Language .Language }}
<li class="pure-menu-item">
<a href="{{ .RelPermalink }}" lang="{{ .Language.Params.languageCode }}" hreflang="{{ .Language.Params.languageCode }}" class="pure-menu-link">{{ if $isCurrentLang }}✓ {{ end }}{{ .Language.LanguageName }}</a>
</li>
{{ end }}
</ul>
</li>
{{ end }}
</ul>
</div>
</nav>
</div>
</header>
<div id="site-banner">
<a href="https://abetterinternet.org/tenth-anniversary">{{ i18n "site_banner_text" }}</a>
</div>
<div id="main-content"></div>
{{ end }}{{/* if ne .Section "documents" */}}
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link href="https://fonts.googleapis.com/css2?family=Source+Serif+Pro:ital,wght@0,400;0,700;1,400&display=swap" rel="stylesheet">
<style>
* {
font-family: 'Source Serif Pro', serif;
}
</style>
2 changes: 1 addition & 1 deletion layouts/partials/hero.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{{ if ne .Section "documents" }}
{{ $bgImage := printf "images/%d.jpg" (.Param "top_graphic") | relURL }}
<div class="hero slim" style="background-image: url('{{ $bgImage }}');">
<div class="hero slim">
<div class="container">
<h1>{{ .Title }}</h1>
</div>
Expand Down
1 change: 1 addition & 0 deletions netlify.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Permissions-Policy = """
Content-Security-Policy = """
default-src 'none';
font-src 'self';
frame-ancestors 'self' https://isrg.formstack.com;
style-src 'unsafe-inline' 'self';
script-src 'unsafe-eval' 'unsafe-inline' 'self' data:
https://www.google-analytics.com
Expand Down