Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
IRMA
Github mirrors
irmago
Commits
29ec24a3
Commit
29ec24a3
authored
Feb 14, 2019
by
Sietse Ringers
Browse files
Move static file hosting to client server, if enabled
parent
07356613
Changes
1
Hide whitespace changes
Inline
Side-by-side
server/requestorserver/server.go
View file @
29ec24a3
...
...
@@ -127,17 +127,8 @@ func (s *Server) ClientHandler() http.Handler {
router
.
Use
(
cors
.
New
(
corsOptions
)
.
Handler
)
router
.
Mount
(
"/irma/"
,
s
.
irmaserv
.
HandlerFunc
())
if
s
.
conf
.
StaticPath
!=
""
{
url
:=
s
.
conf
.
URL
[
:
len
(
s
.
conf
.
URL
)
-
6
]
+
s
.
conf
.
StaticPrefix
s
.
conf
.
Logger
.
Infof
(
"Hosting files at %s under %s"
,
s
.
conf
.
StaticPath
,
url
)
middleware
.
DefaultLogger
=
middleware
.
RequestLogger
(
&
middleware
.
DefaultLogFormatter
{
Logger
:
log
.
New
(
s
.
conf
.
Logger
.
WriterLevel
(
logrus
.
TraceLevel
),
"static: "
,
0
),
NoColor
:
true
,
})
router
.
Mount
(
s
.
conf
.
StaticPrefix
,
http
.
StripPrefix
(
s
.
conf
.
StaticPrefix
,
middleware
.
Logger
(
http
.
FileServer
(
http
.
Dir
(
s
.
conf
.
StaticPath
)))),
)
router
.
Mount
(
s
.
conf
.
StaticPrefix
,
s
.
StaticFilesHandler
())
}
return
router
...
...
@@ -152,6 +143,9 @@ func (s *Server) Handler() http.Handler {
if
!
s
.
conf
.
separateClientServer
()
{
// Mount server for irmaclient
router
.
Mount
(
"/irma/"
,
s
.
irmaserv
.
HandlerFunc
())
if
s
.
conf
.
StaticPath
!=
""
{
router
.
Mount
(
s
.
conf
.
StaticPrefix
,
s
.
StaticFilesHandler
())
}
}
// Server routes
...
...
@@ -170,6 +164,17 @@ func (s *Server) Handler() http.Handler {
return
router
}
func
(
s
*
Server
)
StaticFilesHandler
()
http
.
Handler
{
url
:=
s
.
conf
.
URL
[
:
len
(
s
.
conf
.
URL
)
-
6
]
+
s
.
conf
.
StaticPrefix
s
.
conf
.
Logger
.
Infof
(
"Hosting files at %s under %s"
,
s
.
conf
.
StaticPath
,
url
)
// Hook up chi middleware logger with our own logger
middleware
.
DefaultLogger
=
middleware
.
RequestLogger
(
&
middleware
.
DefaultLogFormatter
{
Logger
:
log
.
New
(
s
.
conf
.
Logger
.
WriterLevel
(
logrus
.
TraceLevel
),
"static: "
,
0
),
NoColor
:
true
,
})
return
http
.
StripPrefix
(
s
.
conf
.
StaticPrefix
,
middleware
.
Logger
(
http
.
FileServer
(
http
.
Dir
(
s
.
conf
.
StaticPath
))))
}
func
(
s
*
Server
)
handleCreate
(
w
http
.
ResponseWriter
,
r
*
http
.
Request
)
{
body
,
err
:=
ioutil
.
ReadAll
(
r
.
Body
)
if
err
!=
nil
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment