Add bootstrap icon to the vendor folder

yhwang · yingsu00 · commit db0fe87053df · 2025-02-18T11:55:42.000-08:00
Since the CSP style-src is enforced, need to serve the bootstrap
icon locally as well. Add the CSS/font files to vendor/bootstrap.
Also update the CSP header to include the proper `img-src` directive.

Signed-off-by: Yihong Wang &lt;yh.wang@ibm.com&gt;
diff --git a/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java b/presto-main/src/main/java/com/facebook/presto/server/CoordinatorModule.java
@@ -144,10 +144,10 @@ protected void setup(Binder binder)
     {
         httpServerBinder(binder).bindResource("/ui", "webapp").withWelcomeFile("index.html")
                 .withExtraHeader(HttpHeaders.X_CONTENT_TYPE_OPTIONS, "nosniff")
-                .withExtraHeader(HttpHeaders.CONTENT_SECURITY_POLICY, "default-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-ancestors 'self'");
+                .withExtraHeader(HttpHeaders.CONTENT_SECURITY_POLICY, "default-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-ancestors 'self'; img-src http: https: data:");
         httpServerBinder(binder).bindResource("/tableau", "webapp/tableau")
                 .withExtraHeader(HttpHeaders.X_CONTENT_TYPE_OPTIONS, "nosniff")
-                .withExtraHeader(HttpHeaders.CONTENT_SECURITY_POLICY, "default-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-ancestors 'self'");
+                .withExtraHeader(HttpHeaders.CONTENT_SECURITY_POLICY, "default-src 'self'; style-src 'self' 'unsafe-inline' https://fonts.googleapis.com; font-src 'self' https://fonts.gstatic.com; frame-ancestors 'self'; img-src http: https: data:");
 
         // discovery server
         install(installModuleIf(EmbeddedDiscoveryConfig.class, EmbeddedDiscoveryConfig::isEnabled, new EmbeddedDiscoveryModule()));
diff --git a/presto-ui/src/static/dev/index.html b/presto-ui/src/static/dev/index.html
@@ -9,7 +9,7 @@
 
     <link rel="icon" href="../assets/favicon.ico">
     <!-- Link for btn checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="../vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- Bootstrap core -->
     <link href="../vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
diff --git a/presto-ui/src/static/embedded_plan.html b/presto-ui/src/static/embedded_plan.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/index.html b/presto-ui/src/static/index.html
@@ -9,7 +9,7 @@
 
     <link rel="icon" href="assets/favicon.ico">
     <!-- Link for btn checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- Bootstrap core -->
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
@@ -27,14 +27,6 @@
     <!-- Bootstrap JS -->
     <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.bundle.min.js"></script>
 
-
-
-    <script type="text/javascript" >
-        jQuery.htmlPrefilter = function( html ) {
-            return html;
-        };
-    </script>
-
     <!-- CSS loader -->
     <link href="vendor/css-loaders/loader.css" rel="stylesheet">
 
diff --git a/presto-ui/src/static/plan.html b/presto-ui/src/static/plan.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/query.html b/presto-ui/src/static/query.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
      <!-- Link for icons checkmark-->
-     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+     <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/res_groups.html b/presto-ui/src/static/res_groups.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/sql_client.html b/presto-ui/src/static/sql_client.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/stage.html b/presto-ui/src/static/stage.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/timeline.html b/presto-ui/src/static/timeline.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
diff --git a/presto-ui/src/static/vendor/bootstrap/css/bootstrap-icons.min.css b/presto-ui/src/static/vendor/bootstrap/css/bootstrap-icons.min.css
diff --git a/presto-ui/src/static/vendor/bootstrap/css/fonts/bootstrap-icons.woff b/presto-ui/src/static/vendor/bootstrap/css/fonts/bootstrap-icons.woff
diff --git a/presto-ui/src/static/vendor/bootstrap/css/fonts/bootstrap-icons.woff2 b/presto-ui/src/static/vendor/bootstrap/css/fonts/bootstrap-icons.woff2
diff --git a/presto-ui/src/static/worker.html b/presto-ui/src/static/worker.html
@@ -13,7 +13,7 @@
     <link href="vendor/bootstrap/css/bootstrap.min.css" rel="stylesheet">
 
     <!-- Link for icons checkmark-->
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    <link rel="stylesheet" href="vendor/bootstrap/css/bootstrap-icons.min.css">
 
     <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
     <!--[if lt IE 9]>
