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
eb097aee
Commit
eb097aee
authored
Feb 06, 2019
by
Sietse Ringers
Browse files
Make server core package internal and rename to servercore
parent
60e4f166
Changes
5
Hide whitespace changes
Inline
Side-by-side
server
/
core/api.go
→
internal/
servercore/api.go
View file @
eb097aee
...
...
@@ -2,7 +2,7 @@
// or attribute-based signature applications to perform IRMA sessions with irmaclient instances
// (i.e. the IRMA app). It exposes a small interface to expose to other programming languages
// through cgo. It is used by the irmarequestor package but otherwise not meant for use in Go.
package
core
package
server
core
import
(
"encoding/json"
...
...
server
/
core/handle.go
→
internal/
servercore/handle.go
View file @
eb097aee
package
core
package
server
core
import
(
"github.com/privacybydesign/gabi"
...
...
server
/
core/helpers.go
→
internal/
servercore/helpers.go
View file @
eb097aee
package
core
package
server
core
import
(
"encoding/json"
...
...
server
/
core/sessions.go
→
internal/
servercore/sessions.go
View file @
eb097aee
package
core
package
server
core
import
(
"math/rand"
...
...
server/irmarequestor/main.go
View file @
eb097aee
...
...
@@ -11,13 +11,13 @@ import (
"github.com/go-errors/errors"
"github.com/privacybydesign/irmago"
"github.com/privacybydesign/irmago/internal/servercore"
"github.com/privacybydesign/irmago/server"
"github.com/privacybydesign/irmago/server/core"
)
// Server is an irmareqestor server instance.
type
Server
struct
{
*
core
.
Server
*
server
core
.
Server
handlers
map
[
string
]
SessionHandler
}
...
...
@@ -26,7 +26,7 @@ type Server struct {
type
SessionHandler
func
(
*
server
.
SessionResult
)
func
New
(
conf
*
server
.
Configuration
)
(
*
Server
,
error
)
{
s
,
err
:=
core
.
New
(
conf
)
s
,
err
:=
server
core
.
New
(
conf
)
if
err
!=
nil
{
return
nil
,
err
}
...
...
@@ -68,7 +68,7 @@ func (s *Server) HttpHandlerFunc() http.HandlerFunc {
}
}
token
,
noun
,
err
:=
core
.
ParsePath
(
r
.
URL
.
Path
)
token
,
noun
,
err
:=
server
core
.
ParsePath
(
r
.
URL
.
Path
)
if
err
==
nil
&&
noun
==
"statusevents"
{
// if err != nil we let it be handled by HandleProtocolMessage below
if
err
=
s
.
SubscribeServerSentEvents
(
w
,
r
,
token
);
err
!=
nil
{
server
.
WriteError
(
w
,
server
.
ErrorUnexpectedRequest
,
err
.
Error
())
...
...
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