Skip to content

Commit b432985

Browse files
Merge pull request #18505 from mrogers950/osin-log
Automatic merge from submit-queue (batch tested with PRs 18505, 18617, 18604). Enable osin internal error logging osin now has an interface for internal error logging that provides some additional context on failure. Example output: ``` === RUN TestClientCredentialFlow --- PASS: TestClientCredentialFlow (0.00s) === RUN TestAuthorizeStartFlow I0206 14:58:22.818652 22392 access.go:561] osin: error=unauthorized_client, internal_error=<nil> get_client=client check failed, client_id=test --- FAIL: TestAuthorizeStartFlow (0.00s) osinserver_test.go:95: unexpected error: The client is not authorized to request a token using this method. osinserver_test.go:135: unexpected error: Get http://127.0.0.1:39369/assert?code=KWhLRoflbPdPCNYNP6T3MpqZn4mv0zxKLU6TRg6QEAc&state=: EOF ``` @openshift/sig-security
2 parents 6aba27d + 8dba897 commit b432985

File tree

14 files changed

+237
-100
lines changed

14 files changed

+237
-100
lines changed

glide.lock

+12-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

glide.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ import:
134134
version: 32a13797442ccb601b11761d74232773c1402d14
135135
# auth (for sally)
136136
- package: github.com/RangelReale/osin
137-
version: 829186e6c125f77df6d6ae0162a9ba59fad91e2d
137+
version: 2dc1b43167692cdc89446b99b98fa9de6bff020f
138138
# auth (for sally)
139139
- package: github.com/RangelReale/osincli
140140
version: fababb0555f21315d1a34af6615a16eaab44396b

pkg/oauthserver/osinserver/osinserver.go

+12
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"path"
77

88
"github.com/RangelReale/osin"
9+
"github.com/golang/glog"
910

1011
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
1112
)
@@ -24,12 +25,23 @@ type Server struct {
2425
errorHandler ErrorHandler
2526
}
2627

28+
// Logger captures additional osin server errors
29+
type Logger struct {
30+
}
31+
32+
func (l Logger) Printf(format string, v ...interface{}) {
33+
if glog.V(2) {
34+
glog.ErrorDepth(3, fmt.Sprintf("osin: "+format, v...))
35+
}
36+
}
37+
2738
func New(config *osin.ServerConfig, storage osin.Storage, authorize AuthorizeHandler, access AccessHandler, errorHandler ErrorHandler) *Server {
2839
server := osin.NewServer(config, storage)
2940

3041
// Override tokengen to ensure we get valid length tokens
3142
server.AuthorizeTokenGen = TokenGen{}
3243
server.AccessTokenGen = TokenGen{}
44+
server.Logger = Logger{}
3345

3446
return &Server{
3547
config: config,

0 commit comments

Comments
 (0)