record-tester: added access control testing #220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
victorges
approved these changes
Nov 22, 2022
| @@ -156,6 +184,19 @@ func (rt *recordTester) Start(fileName string, testDuration, pauseDuration time. | |||
| mediaURL := fmt.Sprintf("%s/%s/index.m3u8", ingest.Playback, stream.PlaybackID) | |||
| glog.V(model.SHORT).Infof("RTMP: %s", rtmpURL) | |||
| glog.V(model.SHORT).Infof("MEDIA: %s", mediaURL) | |||
|
|
|||
| if rt.accessControl && (rt.signingKey != "" && rt.publicKey != "") { | |||
There was a problem hiding this comment.
Having accessControl and not the signing key should be an explicit fatal error. We should not ignore the setting because another required option was not provided, it is better to just fail the whole test.
Suggested change
| if rt.accessControl && (rt.signingKey != "" && rt.publicKey != "") { | |
| if rt.accessControl { | |
| if rt.signingKey == "" || rt.publicKey == "" { | |
| msg := "Signing key and public key are required for access control test" | |
| glog.Fatal(msg) | |
| return 1, errors.New(msg) // (Fatal log above already exits the process but you know just in case, leave it clear here that we end with an error) | |
| } |
Comment on lines
+195
to
+198
| } else { | ||
| glog.Warningf("No access control for stream id=%s playbackId=%s name=%s mediaURL=%s", stream.ID, stream.PlaybackID, streamName, mediaURL) | ||
| return 2, nil | ||
| } |
There was a problem hiding this comment.
No reason to log this as a warning or returning. Executing a test without access control is perfectly acceptable. And we already log above when we use access control so no need to log when we don't.
Suggested change
| } else { | |
| glog.Warningf("No access control for stream id=%s playbackId=%s name=%s mediaURL=%s", stream.ID, stream.PlaybackID, streamName, mediaURL) | |
| return 2, nil | |
| } | |
| } |
| // uploader := testers.NewRtmpStreamer(gctx, rtmpURL) | ||
| // uploader.StartUpload(fileName, rtmpURL, -1, 30*time.Second) | ||
| return es, err | ||
| return 0, err |
There was a problem hiding this comment.
nit: We know err is nil here so we can be explicit. Just so one doesn't start wondering here where this err could be instead of nil (from what I checked, it can't)
Suggested change
| return 0, err | |
| return 0, nil |
Comment on lines
+435
to
+443
| if err != nil { | ||
| glog.Errorf("Unable to parse provided signing key for access control signingKey=%s", rt.signingKey) | ||
| } | ||
|
|
||
| token, err := unsignedToken.SignedString(pk) | ||
|
|
||
| if err != nil { | ||
| glog.Errorf("Unable to sign JWT with provided private key for access control signingKey=%s", rt.signingKey) | ||
| } |
There was a problem hiding this comment.
We need to return all these errors. Cannot just log.
Suggested change
| if err != nil { | |
| glog.Errorf("Unable to parse provided signing key for access control signingKey=%s", rt.signingKey) | |
| } | |
| token, err := unsignedToken.SignedString(pk) | |
| if err != nil { | |
| glog.Errorf("Unable to sign JWT with provided private key for access control signingKey=%s", rt.signingKey) | |
| } | |
| if err != nil { | |
| glog.Errorf("Unable to parse provided signing key for access control signingKey=%s", rt.signingKey) | |
| return "", err | |
| } | |
| token, err := unsignedToken.SignedString(pk) | |
| if err != nil { | |
| glog.Errorf("Unable to sign JWT with provided private key for access control signingKey=%s", rt.signingKey) | |
| return "", err | |
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #204