Skip to content

Revert "Fix CSP issues" #36929

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

Merged
merged 1 commit into from
Nov 27, 2025
+9 −70
Merged

Revert "Fix CSP issues" #36929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ tasks.rat {
"**/Gemfile.lock",
"**/Rakefile",
"**/.htaccess",
"website/www/site/assets/css/**/*",
"website/www/site/assets/scss/_bootstrap.scss",
"website/www/site/assets/scss/bootstrap/**/*",
"website/www/site/assets/js/**/*",
Expand Down
5 changes: 0 additions & 5 deletions website/www/site/assets/css/fontawesome/release-v5.4.1.css
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions website/www/site/assets/css/roboto/roboto.css
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions website/www/site/assets/css/swiper@8/swiper-bundle.min.css
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions website/www/site/assets/js/jquery/jquery-2.2.4.min.js
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions website/www/site/layouts/partials/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<title>{{ if .Title }}{{ .Title }}{{ else }}{{ .Site.Title }}{{ end }}</title>
<meta name="description" content="{{ .Description | default $.Site.Params.description }}">

<link href="css/roboto/roboto.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700" rel="stylesheet">

{{ $scssMain := "scss/main.scss"}}
{{ if .Site.IsServer }}
Expand All @@ -29,7 +29,7 @@
<link href="{{ $css.RelPermalink }}" rel="stylesheet" integrity="{{ $css.Data.integrity }}">
{{ end }}

<script src="js/jquery/jquery-2.2.4.min.js"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>

<style>
.body__contained img { max-width: 100% }
Expand Down Expand Up @@ -69,8 +69,8 @@
<link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href="/feed.xml">
<link rel="canonical" href="{{ .Site.Params.hostName }}{{ .Permalink | absURL }}" data-proofer-ignore>
<link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
<link rel="stylesheet" href="css/fontawesome/release-v5.4.1.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
<link rel="stylesheet" href="css/swiper@8/swiper-bundle.min.css"/>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
<link rel="stylesheet" href="https://unpkg.com/swiper@8/swiper-bundle.min.css"/>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>

<!-- Hotjar Tracking Code for https://beam.apache.org/ -->
Expand Down
8 changes: 4 additions & 4 deletions website/www/site/layouts/partials/head_homepage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<title>{{ if .Title }}{{ .Title }}{{ else }}{{ .Site.Title }}{{ end }}</title>
<meta name="description" content="{{ .Description | default $.Site.Params.description }}">

<link href="css/roboto/roboto.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700" rel="stylesheet">

{{ $scssMain := "scss/main.scss"}}
{{ if .Site.IsServer }}
Expand All @@ -29,7 +29,7 @@
<link href="{{ $css.RelPermalink }}" rel="stylesheet" integrity="{{ $css.Data.integrity }}">
{{ end }}

<script src="js/jquery/jquery-2.2.4.min.js"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"></script>

<style>
.body__contained img { max-width: 100% }
Expand Down Expand Up @@ -60,8 +60,8 @@
<link rel="alternate" type="application/rss+xml" title="{{ .Site.Title }}" href="/feed.xml">
<link rel="canonical" href="{{ .Site.Params.hostName }}{{ .Permalink | absURL }}" data-proofer-ignore>
<link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
<link rel="stylesheet" href="css/fontawesome/release-v5.4.1.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
<link rel="stylesheet" href="css/swiper@8/swiper-bundle.min.css"/>
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.4.1/css/all.css" integrity="sha384-5sAR7xN1Nv6T6+dT2mhtzEpVJvfS3NScPQTrOxhwjIuvcA67KV2R5Jz6kr4abQsz" crossorigin="anonymous">
<link rel="stylesheet" href="https://unpkg.com/swiper@8/swiper-bundle.min.css"/>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>

<!-- Hotjar Tracking Code for https://beam.apache.org/ -->
Expand Down
5 changes: 1 addition & 4 deletions website/www/site/static/.htaccess
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,4 @@ RedirectMatch "/contribute/release-guide" "https://github.com/apache/beam/blob/m

RedirectMatch "/contribute/committer-guide" "https://github.com/apache/beam/blob/master/contributor-docs/committer-guide.md"

# Allow embedding content from play.beam.apache.org, youtube.com, drive.google.com, platform.twitter.com,
# static.hotjar.com, cse.google.com, www.google.com/cse, clients1.google.com and fonts.gstatic.com.
# This is the standard way to add local exceptions to the CSP, see https://infra.apache.org/tools/csp.html
SetEnv CSP_PROJECT_DOMAINS "https://play.beam.apache.org/ https://www.youtube.com/ https://drive.google.com/ https://platform.twitter.com/ https://static.hotjar.com/ https://cse.google.com/ http://cse.google.com/ https://www.google.com/cse/ https://fonts.gstatic.com/"
Header set Content-Security-Policy "frame-src 'self' https://play.beam.apache.org/ https://www.youtube.com/ https://drive.google.com/ ;"
Loading