ston1th/docstore
1
1
Fork 0
Code Issues 3 Releases Activity

fixed CSP issue

Browse source
This commit is contained in:
ston1th 2019-09-09 12:17:09 +02:00
commit 621cc2a83e
7 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -1,5 +1,5 @@
CC=go CC=go
BUILD=build -v BUILD=build -v -trimpath
VERSION=$(shell cat VERSION) VERSION=$(shell cat VERSION)
GCFLAGS=-gcflags 'all=-e' GCFLAGS=-gcflags 'all=-e'
LDFLAGS=-ldflags '-X main.version=$(VERSION) -s -w' LDFLAGS=-ldflags '-X main.version=$(VERSION) -s -w'

2
go.mod
View file

@ -1,6 +1,6 @@
module git.giftfish.de/ston1th/docstore module git.giftfish.de/ston1th/docstore
go 1.12 go 1.13
require ( require (
git.giftfish.de/ston1th/authdav v1.1.0 git.giftfish.de/ston1th/authdav v1.1.0

1
pkg/server/handler.go
View file

@ -170,6 +170,7 @@ func rawHandler(ctx *Context) {
} }
return return
} }
ctx.Response.Header().Del("Content-Security-Policy")
http.ServeContent(ctx.Response, ctx.Request, fi.Name(), fi.ModTime(), f) http.ServeContent(ctx.Response, ctx.Request, fi.Name(), fi.ModTime(), f)
} }

6
pkg/server/templates.go
View file

@ -162,7 +162,7 @@ const (
</div> </div>
{{end}} {{end}}
<div class="row"> <div class="row">
<embed src="{{.Data.Abs}}" width="100%" height="700px" toolbar="1" statusbar="1" navpanes="1"></embed> <embed src="{{.Data.Abs}}" toolbar="1" statusbar="1" navpanes="1"></embed>
</div> </div>
{{end}}` {{end}}`
forbidden = `{{define "body"}} forbidden = `{{define "body"}}
@ -188,7 +188,7 @@ const (
<title>DocStore | {{.Title}}</title> <title>DocStore | {{.Title}}</title>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" integrity="sha256-bgotk/IPq4Yvt6s8AQGPTM5ZjPjQ6rrBRa2EyxpnFSc="></link> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" integrity="sha256-bgotk/IPq4Yvt6s8AQGPTM5ZjPjQ6rrBRa2EyxpnFSc="></link>
<link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-3YeveuySvBgp2GItUS8eV1R/9T1zcPMyvw22SyVf8qo="></link> <link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-3YeveuySvBgp2GItUS8eV1R/9T1zcPMyvw22SyVf8qo="></link>
<link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-6jxgK5/GbgoDJ3zQ2bcYXgSUsOvQ1IF18Krslbwlk7w="></link> <link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-wLiyjr/D8ZaaIPLjUmZ3zdm45/HW/cy4kCVTViwkPeI="></link>
<meta name="theme-color" content="#375a7f"> <meta name="theme-color" content="#375a7f">
<meta name="description" content="{{.Title}}"> <meta name="description" content="{{.Title}}">
</head> </head>
@ -833,6 +833,8 @@ code {
} }
embed { embed {
background-color: #999999; background-color: #999999;
width: 100%;
height: 700px;
} }
textarea,input,select { textarea,input,select {
color: #e2e2e2 !important; color: #e2e2e2 !important;

2
templates/custom.css
View file

@ -106,6 +106,8 @@ code {
} }
embed { embed {
background-color: #999999; background-color: #999999;
width: 100%;
height: 700px;
} }
textarea,input,select { textarea,input,select {
color: #e2e2e2 !important; color: #e2e2e2 !important;

2
templates/file.html
View file

@ -35,6 +35,6 @@
</div> </div>
{{end}} {{end}}
<div class="row"> <div class="row">
<embed src="{{.Data.Abs}}" width="100%" height="700px" toolbar="1" statusbar="1" navpanes="1"></embed> <embed src="{{.Data.Abs}}" toolbar="1" statusbar="1" navpanes="1"></embed>
</div> </div>
{{end}} {{end}}

2
templates/index.html
View file

@ -4,7 +4,7 @@
<title>DocStore | {{.Title}}</title> <title>DocStore | {{.Title}}</title>
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" integrity="sha256-bgotk/IPq4Yvt6s8AQGPTM5ZjPjQ6rrBRa2EyxpnFSc="></link> <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" integrity="sha256-bgotk/IPq4Yvt6s8AQGPTM5ZjPjQ6rrBRa2EyxpnFSc="></link>
<link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-3YeveuySvBgp2GItUS8eV1R/9T1zcPMyvw22SyVf8qo="></link> <link rel="stylesheet" type="text/css" href="/bootstrap.css" media="screen" integrity="sha256-3YeveuySvBgp2GItUS8eV1R/9T1zcPMyvw22SyVf8qo="></link>
<link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-6jxgK5/GbgoDJ3zQ2bcYXgSUsOvQ1IF18Krslbwlk7w="></link> <link rel="stylesheet" type="text/css" href="/custom.css" media="screen" integrity="sha256-wLiyjr/D8ZaaIPLjUmZ3zdm45/HW/cy4kCVTViwkPeI="></link>
<meta name="theme-color" content="#375a7f"> <meta name="theme-color" content="#375a7f">
<meta name="description" content="{{.Title}}"> <meta name="description" content="{{.Title}}">
</head> </head>