@@ -314,6 +314,11 @@ func TestJWT(t *testing.T) {
314314 ss , _ := jwt .NewWithClaims (method , testClaim (input )).SignedString (secret )
315315 return ss
316316 }
317+ srv := createAndStartServer (t , & httpConfig {jwtSecret : []byte ("secret" )},
318+ true , & wsConfig {Origins : []string {"*" }, jwtSecret : []byte ("secret" )})
319+ wsUrl := fmt .Sprintf ("ws://%v" , srv .listenAddr ())
320+ htUrl := fmt .Sprintf ("http://%v" , srv .listenAddr ())
321+
317322 expOk := []string {
318323 fmt .Sprintf ("Bearer %v" , issueToken (secret , nil , testClaim {"iat" : time .Now ().Unix ()})),
319324 fmt .Sprintf ("Bearer %v" , issueToken (secret , nil , testClaim {"iat" : time .Now ().Unix () + 4 })),
@@ -327,6 +332,14 @@ func TestJWT(t *testing.T) {
327332 "bar" : "baz" ,
328333 })),
329334 }
335+ for i , token := range expOk {
336+ if err := wsRequest (t , wsUrl , "Authorization" , token ); err != nil {
337+ t .Errorf ("test %d-ws, token '%v': expected ok, got %v" , i , token , err )
338+ }
339+ if resp := rpcRequest (t , htUrl , "Authorization" , token ); resp .StatusCode != 200 {
340+ t .Errorf ("test %d-http, token '%v': expected ok, got %v" , i , token , resp .StatusCode )
341+ }
342+ }
330343 expFail := []string {
331344 // future
332345 fmt .Sprintf ("Bearer %v" , issueToken (secret , nil , testClaim {"iat" : time .Now ().Unix () + 6 })),
@@ -351,19 +364,6 @@ func TestJWT(t *testing.T) {
351364 fmt .Sprintf ("Bearer\t %v" , issueToken (secret , nil , testClaim {"iat" : time .Now ().Unix ()})),
352365 fmt .Sprintf ("Bearer \t %v" , issueToken (secret , nil , testClaim {"iat" : time .Now ().Unix ()})),
353366 }
354- srv := createAndStartServer (t , & httpConfig {jwtSecret : []byte ("secret" )},
355- true , & wsConfig {Origins : []string {"*" }, jwtSecret : []byte ("secret" )})
356- wsUrl := fmt .Sprintf ("ws://%v" , srv .listenAddr ())
357- htUrl := fmt .Sprintf ("http://%v" , srv .listenAddr ())
358-
359- for i , token := range expOk {
360- if err := wsRequest (t , wsUrl , "Authorization" , token ); err != nil {
361- t .Errorf ("test %d-ws, token '%v': expected ok, got %v" , i , token , err )
362- }
363- if resp := rpcRequest (t , htUrl , "Authorization" , token ); resp .StatusCode != 200 {
364- t .Errorf ("test %d-http, token '%v': expected ok, got %v" , i , token , resp .StatusCode )
365- }
366- }
367367 for i , token := range expFail {
368368 if err := wsRequest (t , wsUrl , "Authorization" , token ); err == nil {
369369 t .Errorf ("tc %d-ws, token '%v': expected not to allow, got ok" , i , token )
0 commit comments