Update documentation site (#3789)

cvat-ai · Oct 22, 2021 · 7b40b84 · 7b40b84
1 parent 9747636
commit 7b40b84
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 37 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,7 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Security
 
-- TDB
+- Fix security issues on the documentation website unsafe use of target blank
+  and potential clickjacking on legacy browsers (<https://github.com/openvinotoolkit/cvat/pull/3789>)
 
 ## \[1.6.0] - 2021-09-17
 

diff --git a/site/assets/scss/_custom.scss b/site/assets/scss/_custom.scss
@@ -35,12 +35,6 @@
     padding-top: 2rem !important;
 }
 
-/* Icon color for temporary page */
-
-#temporary-page i {
-    color: lightgrey;
-}
-
 /* About page */
 
 .logo-2 {

diff --git a/site/content/en/_index.html b/site/content/en/_index.html
diff --git a/site/layouts/404.html b/site/layouts/404.html
@@ -1 +1,6 @@
-<meta http-equiv="refresh" content="0; URL=/cvat/page_404">
+<!DOCTYPE html>
+<html lang="en" class="no-js">
+  <head>
+    <meta http-equiv="refresh" content="0; URL=/cvat/page_404">
+  </head>
+</html>
diff --git a/site/layouts/home.html b/site/layouts/home.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<html lang="en" class="no-js">
+  <head>
+    <meta http-equiv="refresh" content="0; URL=/cvat/docs">
+  </head>
+</html>
diff --git a/site/layouts/partials/footer.html b/site/layouts/partials/footer.html
@@ -17,11 +17,11 @@
         {{ end }}
       </div>
       <div class="col-12 col-sm-8 text-center order-sm-2">
-        {{ with .Site.Params.intel_privacy_notice }}<small class="mr-1"><a href="{{ . }}" target="_blank">{{ T "footer_intel_privacy_notice" }}</a></small>{{ end }}
+        {{ with .Site.Params.intel_privacy_notice }}<small class="mr-1"><a href="{{ . }}">{{ T "footer_intel_privacy_notice" }}</a></small>{{ end }}
         |
-        {{ with .Site.Params.intel_terms_of_use }}<small class="mx-1"><a href="{{ . }}" target="_blank">{{ T "footer_intel_terms_of_use" }}</a></small>{{ end }}
+        {{ with .Site.Params.intel_terms_of_use }}<small class="mx-1"><a href="{{ . }}">{{ T "footer_intel_terms_of_use" }}</a></small>{{ end }}
         |
-        {{ with .Site.Params.cvat_terms_of_use }}<small class="ml-1"><a href="{{ . }}" target="_blank">{{ T "footer_cvat_terms_of_use" }}</a></small>{{ end }}
+        {{ with .Site.Params.cvat_terms_of_use }}<small class="ml-1"><a href="{{ . }}">{{ T "footer_cvat_terms_of_use" }}</a></small>{{ end }}
         <br/>
         <div class="footer-disclaimer text-white ">
           <small>Intel technologies may require enabled hardware, software or service activation. // No product or component can be absolutely secure. // Your costs and results may vary. // Performance varies by use, configuration and other factors. // See our complete legal <u><a href="https://edc.intel.com/content/www/us/en/products/performance/benchmarks/overview/?r=219444055">Notices and Disclaimers</a></u>. // Intel is committed to respecting human rights and avoiding complicity in human rights abuses. See Intel’s <a href="https://www.intel.com/content/www/us/en/policy/policy-human-rights.html"><u>Global Human Rights Principles</u></a>. Intel’s products and software are intended only to be used in applications that do not cause or contribute to a violation of an internationally recognized human right.</small>
@@ -37,7 +37,7 @@
 <ul class="list-inline mb-0">
   {{ range . }}
   <li class="list-inline-item mx-2 h3" data-toggle="tooltip" data-placement="top" title="{{ .name }}" aria-label="{{ .name }}">
-    <a class="text-white" target="_blank" rel="noopener noreferrer" href="{{ .url }}">
+    <a class="text-white" rel="noopener noreferrer" href="{{ .url }}">
       <i class="{{ .icon }}"></i>
     </a>
   </li>

diff --git a/site/layouts/partials/navbar.html b/site/layouts/partials/navbar.html
@@ -18,7 +18,7 @@
         {{ $post := .Post }}
         {{ $url := urls.Parse .URL }}
         {{ $baseurl := urls.Parse $.Site.Params.Baseurl }}
-        <a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }}target="_blank" {{ end }}>{{ with .Pre}}{{ $pre }}{{ end }}<span{{if $active }} class="active"{{end}}>{{ .Name }}</span>{{ with .Post}}{{ $post }}{{ end }}</a>
+        <a class="nav-link{{if $active }} active{{end}}" href="{{ with .Page }}{{ .RelPermalink }}{{ else }}{{ .URL | relLangURL }}{{ end }}" {{ if ne $url.Host $baseurl.Host }} {{ end }}>{{ with .Pre}}{{ $pre }}{{ end }}<span{{if $active }} class="active"{{end}}>{{ .Name }}</span>{{ with .Post}}{{ $post }}{{ end }}</a>
       </li>
       {{ end }}
       {{ if  .Site.Params.versions }}