Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable osin internal error logging #18505

Merged
merged 3 commits into from
Feb 15, 2018
Merged

Enable osin internal error logging #18505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51e921e
update osin version in glide.yaml
Feb 13, 2018
ad82d40
bump(*)
Feb 14, 2018
8dba897
enable additional osin server error logging
Feb 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 12 additions & 23 deletions glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ import:
version: 32a13797442ccb601b11761d74232773c1402d14
# auth (for sally)
- package: github.com/RangelReale/osin
version: 829186e6c125f77df6d6ae0162a9ba59fad91e2d
version: 2dc1b43167692cdc89446b99b98fa9de6bff020f
# auth (for sally)
- package: github.com/RangelReale/osincli
version: fababb0555f21315d1a34af6615a16eaab44396b
Expand Down
12 changes: 12 additions & 0 deletions pkg/oauthserver/osinserver/osinserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"path"

"github.com/RangelReale/osin"
"github.com/golang/glog"

utilruntime "k8s.io/apimachinery/pkg/util/runtime"
)
Expand All @@ -24,12 +25,23 @@ type Server struct {
errorHandler ErrorHandler
}

// Logger captures additional osin server errors
type Logger struct {
}

func (l Logger) Printf(format string, v ...interface{}) {
if glog.V(2) {
glog.ErrorDepth(3, fmt.Sprintf("osin: "+format, v...))
}
}

func New(config *osin.ServerConfig, storage osin.Storage, authorize AuthorizeHandler, access AccessHandler, errorHandler ErrorHandler) *Server {
server := osin.NewServer(config, storage)

// Override tokengen to ensure we get valid length tokens
server.AuthorizeTokenGen = TokenGen{}
server.AccessTokenGen = TokenGen{}
server.Logger = Logger{}

return &Server{
config: config,
Expand Down
Loading