railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

iOS DRM Fixes for License Fetching (#2208)

Browse Source
This commit is contained in:
Nick Fujita 2021-01-13 19:18:01 +09:00 committed by GitHub
parent faf8aed29b
commit 88b636f158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Video.js
View File

@ -236,8 +236,8 @@ export default class Video extends Component {
_onGetLicense = (event) => { _onGetLicense = (event) => {
if (this.props.drm && this.props.drm.getLicense instanceof Function) { if (this.props.drm && this.props.drm.getLicense instanceof Function) {
const data = event.nativeEvent; const data = event.nativeEvent;
if (data && data.spc) { if (data && data.spcBase64) {
const getLicenseOverride = this.props.drm.getLicense(data.spc, data.contentId, data.spcBase64, this.props); 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. const getLicensePromise = Promise.resolve(getLicenseOverride); // Handles both scenarios, getLicenseOverride being a promise and not.
getLicensePromise.then((result => { getLicensePromise.then((result => {
if (result !== undefined) { if (result !== undefined) {

44
ios/Video/RCTVideo.m
View File

@ -1764,11 +1764,15 @@ didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest {
} }
_loadingRequest = loadingRequest; _loadingRequest = loadingRequest;
NSURL *url = loadingRequest.request.URL; NSURL *url = loadingRequest.request.URL;
NSString *contentId = url.host;
if (self->_drm != nil) { if (self->_drm != nil) {
NSString *contentId;
NSString *contentIdOverride = (NSString *)[self->_drm objectForKey:@"contentId"]; NSString *contentIdOverride = (NSString *)[self->_drm objectForKey:@"contentId"];
if (contentIdOverride != nil) { if (contentIdOverride != nil) {
contentId = contentIdOverride; contentId = contentIdOverride;
} else if (self.onGetLicense) {
contentId = url.host;
} else {
contentId = [url.absoluteString stringByReplacingOccurrencesOfString:@"skd://" withString:@""];
} }
NSString *drmType = (NSString *)[self->_drm objectForKey:@"type"]; NSString *drmType = (NSString *)[self->_drm objectForKey:@"type"];
if ([drmType isEqualToString:@"fairplay"]) { if ([drmType isEqualToString:@"fairplay"]) {
@ -1782,7 +1786,12 @@ didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest {
} }
if (certificateData != nil) { 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]; AVAssetResourceLoadingDataRequest *dataRequest = [loadingRequest dataRequest];
if (dataRequest != nil) { if (dataRequest != nil) {
NSError *spcError = nil; NSError *spcError = nil;
@ -1795,12 +1804,16 @@ didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest {
} }
if (spcData != nil) { if (spcData != nil) {
if(self.onGetLicense) { if(self.onGetLicense) {
NSString *spcStr = [[NSString alloc] initWithData:spcData encoding:NSASCIIStringEncoding]; NSString *base64Encoded = [spcData base64EncodedStringWithOptions:0];
self->_requestingCertificate = YES; self->_requestingCertificate = YES;
self.onGetLicense(@{@"spc": spcStr, if (licenseServer == nil) {
licenseServer = @"";
}
self.onGetLicense(@{@"licenseUrl": licenseServer,
@"contentId": contentId, @"contentId": contentId,
@"spcBase64": [[[NSData alloc] initWithBase64EncodedData:certificateData options:NSDataBase64DecodingIgnoreUnknownCharacters] base64EncodedStringWithOptions:0], @"spcBase64": base64Encoded,
@"target": self.reactTag}); @"target": self.reactTag}
);
} else if(licenseServer != nil) { } else if(licenseServer != nil) {
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init]; NSMutableURLRequest *request = [[NSMutableURLRequest alloc] init];
[request setHTTPMethod:@"POST"]; [request setHTTPMethod:@"POST"];
@ -1813,9 +1826,17 @@ didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest {
[request setValue:value forHTTPHeaderField:key]; [request setValue:value forHTTPHeaderField:key];
} }
} }
//
[request setHTTPBody: spcData]; 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];
}
NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration]; NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil]; NSURLSession *session = [NSURLSession sessionWithConfiguration:configuration delegate:self delegateQueue:nil];
NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) { NSURLSessionDataTask *postDataTask = [session dataTaskWithRequest:request completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
@ -1838,7 +1859,12 @@ didCancelLoadingRequest:(AVAssetResourceLoadingRequest *)loadingRequest {
[self finishLoadingWithError:licenseError]; [self finishLoadingWithError:licenseError];
self->_requestingCertificateErrored = YES; self->_requestingCertificateErrored = YES;
} else if (data != nil) { } 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]; [loadingRequest finishLoading];
} else { } else {
NSError *licenseError = [NSError errorWithDomain: @"RCTVideo" NSError *licenseError = [NSError errorWithDomain: @"RCTVideo"