Skip to content

iOS DRM Fixes for License Fetching #2208

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

Merged
nickfujita merged 11 commits into from
Jan 13, 2021
Merged

iOS DRM Fixes for License Fetching #2208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
81e7eef
updates to code to allow full native drm code to run
nickfujita Nov 13, 2020
0b2d96f
cleanup
nickfujita Nov 13, 2020
10d31b7
cleanup
nickfujita Nov 13, 2020
6cd7ac1
cleanup
nickfujita Nov 13, 2020
10a5c1f
add back decoded data passed to player
nickfujita Nov 16, 2020
02884ee
separate logic for getLicense js handling and native handling
nickfujita Dec 3, 2020
6d1b46f
fix
nickfujita Dec 3, 2020
1660ea3
Revert "fix"
nickfujita Dec 21, 2020
dc2608e
Revert "separate logic for getLicense js handling and native handling"
nickfujita Dec 21, 2020
954ebb8
cleanup
nickfujita Dec 21, 2020
44b5915
fix
nickfujita Jan 7, 2021
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
4 changes: 2 additions & 2 deletions Video.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,8 @@ export default class Video extends Component {
_onGetLicense = (event) => {
if (this.props.drm && this.props.drm.getLicense instanceof Function) {
const data = event.nativeEvent;
if (data && data.spc) {
const getLicenseOverride = this.props.drm.getLicense(data.spc, data.contentId, data.spcBase64, this.props);
if (data && data.spcBase64) {
const getLicenseOverride = this.props.drm.getLicense(data.spcBase64, data.contentId, data.licenseUrl);
const getLicensePromise = Promise.resolve(getLicenseOverride); // Handles both scenarios, getLicenseOverride being a promise and not.
getLicensePromise.then((result => {
if (result !== undefined) {
Expand Down
46 changes: 36 additions & 10 deletions ios/Video/RCTVideo.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,11 +1764,15 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
}
_loadingRequest = loadingRequest;
NSURL *url = loadingRequest.request.URL;
NSString *contentId = url.host;
if (self->_drm != nil) {
NSString *contentId;
NSString *contentIdOverride = (NSString *)[self->_drm objectForKey:@"contentId"];
if (contentIdOverride != nil) {
contentId = contentIdOverride;
} else if (self.onGetLicense) {
contentId = url.host;
} else {
contentId = [url.absoluteString stringByReplacingOccurrencesOfString:@"skd://" withString:@""];
}
NSString *drmType = (NSString *)[self->_drm objectForKey:@"type"];
if ([drmType isEqualToString:@"fairplay"]) {
Expand All @@ -1782,7 +1786,12 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
}

if (certificateData != nil) {
NSData *contentIdData = [contentId dataUsingEncoding:NSUTF8StringEncoding];
NSData *contentIdData;
if(self.onGetLicense) {
contentIdData = [contentId dataUsingEncoding:NSUTF8StringEncoding];
} else {
contentIdData = [NSData dataWithBytes: [contentId cStringUsingEncoding:NSUTF8StringEncoding] length:[contentId lengthOfBytesUsingEncoding:NSUTF8StringEncoding]];
}
AVAssetResourceLoadingDataRequest *dataRequest = [loadingRequest dataRequest];
if (dataRequest != nil) {
NSError *spcError = nil;
Expand All @@ -1795,12 +1804,16 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
}
if (spcData != nil) {
if(self.onGetLicense) {
NSString *spcStr = [[NSString alloc] initWithData:spcData encoding:NSASCIIStringEncoding];
NSString *base64Encoded = [spcData base64EncodedStringWithOptions:0];
self->_requestingCertificate = YES;
self.onGetLicense(@{@"spc": spcStr,
if (licenseServer == nil) {
licenseServer = @"";
}
self.onGetLicense(@{@"licenseUrl": licenseServer,
@"contentId": contentId,
@"spcBase64": [[[NSData alloc] initWithBase64EncodedData:certificateData options:NSDataBase64DecodingIgnoreUnknownCharacters] base64EncodedStringWithOptions:0],
@"target": self.reactTag});
@"spcBase64": base64Encoded,
@"target": self.reactTag}
);
} else if(licenseServer != nil) {
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
[request setHTTPMethod:@"POST"];
Expand All @@ -1813,9 +1826,17 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
[request setValue:value forHTTPHeaderField:key];
}
}
//

if(self.onGetLicense) {
[request setHTTPBody: spcData];
} else {
NSString *spcEncoded = [spcData base64EncodedStringWithOptions:0];
NSString *spcUrlEncoded = (NSString *) CFBridgingRelease(CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (CFStringRef)spcEncoded, NULL, CFSTR("?=&+"), kCFStringEncodingUTF8));
NSString *post = [NSString stringWithFormat:@"spc=%@&%@", spcUrlEncoded, contentId];
NSData *postData = [post dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES];
[request setHTTPBody: postData];
}

[request setHTTPBody: spcData];
NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
Expand All @@ -1838,7 +1859,12 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
[self finishLoadingWithError:licenseError];
self->_requestingCertificateErrored = YES;
} else if (data != nil) {
[dataRequest respondWithData:data];
if(self.onGetLicense) {
[dataRequest respondWithData:data];
} else {
NSData *decodedData = [[NSData alloc] initWithBase64EncodedData:data options:0];
[dataRequest respondWithData:decodedData];
}
[loadingRequest finishLoading];
} else {
NSError *licenseError = [NSError errorWithDomain: @"RCTVideo"
Expand All @@ -1852,7 +1878,7 @@ - (BOOL)loadingRequestHandling:(AVAssetResourceLoadingRequest *)loadingRequest {
[self finishLoadingWithError:licenseError];
self->_requestingCertificateErrored = YES;
}

}
}];
[postDataTask resume];
Expand Down