Skip to content

Commit 3bfc255

Browse files
authored
authenticate websocket apis using sts (#97)
1 parent 511cc47 commit 3bfc255

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

restapi/ws_handle.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,8 @@ func (c wsConn) readMessage() (messageType int, p []byte, err error) {
109109
//
110110
// TODO: Enable CORS
111111
func serveWS(w http.ResponseWriter, req *http.Request) {
112-
// authenticate WS connection
113-
// TODO: use this claims to create the adminClient
114-
_, err := ws.Authenticate(req)
112+
// authenticate WS connection with MCS
113+
claims, err := ws.Authenticate(req)
115114
if err != nil {
116115
log.Print("error on ws authentication: ", err)
117116
errors.ServeError(w, req, err)
@@ -126,13 +125,9 @@ func serveWS(w http.ResponseWriter, req *http.Request) {
126125
return
127126
}
128127

129-
// TODO: CHANGE ! to use newMAdminClient once Assume Role is
130-
// allowed to do Trace use jwt on ws.
131-
132-
// Using newSuperMAdminClient in the meantime for sake of functionality
133128
// Only start Websocket Interaction after user has been
134-
// authenticated.
135-
mAdmin, err := newSuperMAdminClient()
129+
// authenticated with MinIO
130+
mAdmin, err := newAdminFromClaims(claims)
136131
if err != nil {
137132
log.Println("error creating Madmin Client:", err)
138133
errors.ServeError(w, req, err)

0 commit comments

Comments
 (0)