VIDEO-13326 Remove S3 link usage #669

asemivragovs · 2024-04-18T15:01:25Z

Description

Remove Amazon S3 link that was posing a security issue SECOPS-4857.
The video file that was hosted is not included in the project bundle.

Breakdown

Remove https://s3-us-west-1.amazonaws.com usage
Add the Resources/twilio_clound_com.mov video file

Contributing to Twilio

All third-party contributors acknowledge that any contributions they provide will be made under the same open-source license that the open-source project is provided under.

I acknowledge that all my contributions will be made under the project's license.

dipankadas

Fix the file name.

dipankadas · 2024-04-18T17:03:22Z

AVPlayerExample.xcodeproj/project.pbxproj

@@ -17,6 +17,7 @@
 		8A0A1F271ECD1FFC0008C1AF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8A0A1F251ECD1FFC0008C1AF /* LaunchScreen.storyboard */; };
 		8A85E4951ECE97F6004719C8 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A85E4941ECE97F6004719C8 /* Utils.m */; };
 		8A85E4981ECEA82D004719C8 /* AVPlayerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8A85E4971ECEA82D004719C8 /* AVPlayerView.m */; };
+		FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */; };


Suggested change

FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */; };

FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB08B2BD169920048DC49 /* twilio_cloud_com.mov */; };

dipankadas · 2024-04-18T17:03:55Z

AVPlayerExample.xcodeproj/project.pbxproj

@@ -48,6 +49,7 @@
 		8A85E4941ECE97F6004719C8 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
 		8A85E4961ECEA82D004719C8 /* AVPlayerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AVPlayerView.h; sourceTree = "<group>"; };
 		8A85E4971ECEA82D004719C8 /* AVPlayerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AVPlayerView.m; sourceTree = "<group>"; };
+		FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };


Suggested change

FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };

FB8AB08B2BD169920048DC49 /* twilio_cloud_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_cloud_com.mov; path = Resources/twilio_cloud_com.mov; sourceTree = "<group>"; };

dipankadas · 2024-04-18T17:04:07Z

AVPlayerExample.xcodeproj/project.pbxproj

@@ -65,6 +67,7 @@
 		8A0A1F0B1ECD1FFC0008C1AF = {
 			isa = PBXGroup;
 			children = (
+				FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */,


Suggested change

FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */,

FB8AB08B2BD169920048DC49 /* twilio_cloud_com.mov */,

dipankadas · 2024-04-18T17:04:20Z

AVPlayerExample.xcodeproj/project.pbxproj

@@ -174,6 +177,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */,


Suggested change

FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */,

FB8AB08C2BD169920048DC49 /* twilio_cloud_com.mov in Resources */,

dipankadas · 2024-04-18T17:04:54Z

AVPlayerExample/ViewController.m

@@ -258,7 +257,7 @@ - (void)startVideoPlayer {
        return;
    }

-    NSURL *contentUrl = [NSURL URLWithString:kVideoMovURL];
+    NSURL *contentUrl = [[NSBundle mainBundle] URLForResource:@"twilio_clound_com" withExtension:@"mov"];


Suggested change

NSURL *contentUrl = [[NSBundle mainBundle] URLForResource:@"twilio_clound_com" withExtension:@"mov"];

NSURL *contentUrl = [[NSBundle mainBundle] URLForResource:@"twilio_cloud_com" withExtension:@"mov"];

dipankadas · 2024-04-18T17:05:29Z

ReplayKitExample.xcodeproj/project.pbxproj

@@ -37,6 +37,7 @@
 		8ADE7A72215DE2D70092D17F /* Settings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A50FEFC215DDC6100297C7A /* Settings.swift */; };
 		8ADE7A74215DE3070092D17F /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A50FEFD215DDC6100297C7A /* Utils.swift */; };
 		8ADE7A75215DE3220092D17F /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8A50FEFD215DDC6100297C7A /* Utils.swift */; };
+		FB8AB08A2BD1697F0048DC49 /* twilio_clound_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */; };


Suggested change

FB8AB08A2BD1697F0048DC49 /* twilio_clound_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */; };

FB8AB08A2BD1697F0048DC49 /* twilio_cloud_com.mov in Resources */ = {isa = PBXBuildFile; fileRef = FB8AB0892BD1697F0048DC49 /* twilio_cloud_com.mov */; };

dipankadas · 2024-04-18T17:05:53Z

ReplayKitExample.xcodeproj/project.pbxproj

@@ -131,6 +132,7 @@
 		8A992CEC2320C26C00D549F6 /* ReplayKitExample-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ReplayKitExample-Bridging-Header.h"; sourceTree = "<group>"; };
 		8A992CED2320C2A300D549F6 /* ExampleReplayKitAudioCapturerDispatch.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ExampleReplayKitAudioCapturerDispatch.h; sourceTree = "<group>"; };
 		8AD6D6E522FFE7CD00EBF279 /* Telecine.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Telecine.swift; sourceTree = "<group>"; };
+		FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };


Suggested change

FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };

FB8AB0892BD1697F0048DC49 /* twilio_cloud_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_cloud_com.mov; path = Resources/twilio_cloud_com.mov; sourceTree = "<group>"; };

dipankadas · 2024-04-18T17:06:05Z

ReplayKitExample.xcodeproj/project.pbxproj

@@ -179,6 +181,7 @@
 		4B20FFD620E9CB8500FE9F2C = {
 			isa = PBXGroup;
 			children = (
+				FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */,


Suggested change

FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */,

FB8AB0892BD1697F0048DC49 /* twilio_cloud_com.mov */,

dipankadas · 2024-04-18T17:06:15Z

ReplayKitExample.xcodeproj/project.pbxproj

@@ -384,6 +387,7 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				FB8AB08A2BD1697F0048DC49 /* twilio_clound_com.mov in Resources */,


Suggested change

FB8AB08A2BD1697F0048DC49 /* twilio_clound_com.mov in Resources */,

FB8AB08A2BD1697F0048DC49 /* twilio_cloud_com.mov in Resources */,

dipankadas · 2024-04-18T17:06:28Z

ReplayKitExample/BroadcastExtensionSetupUI/BroadcastSetupViewController.swift

@@ -19,7 +19,7 @@ class BroadcastSetupViewController: UIViewController {
    // Call this method when the user has finished interacting with the view controller and a broadcast stream can start
    func userDidFinishSetup() {
        // URL of the resource where broadcast can be viewed that will be returned to the application
-        let broadcastURL = URL(string:"https://s3-us-west-1.amazonaws.com/avplayervideo/What+Is+Cloud+Communications.mov")
+        let broadcastURL = Bundle.main.url(forResource: "twilio_clound_com", withExtension: "mov")


Suggested change

let broadcastURL = Bundle.main.url(forResource: "twilio_clound_com", withExtension: "mov")

let broadcastURL = Bundle.main.url(forResource: "twilio_cloud_com", withExtension: "mov")

dipankadas · 2024-04-18T17:35:36Z

@asemivragovs How do we validate this is working? Do we even know how/when that file is supposed to be used?

Remove S3 link usage

d2cb36b

asemivragovs requested a review from dipankadas April 18, 2024 15:01

dipankadas requested changes Apr 18, 2024

View reviewed changes

Fix file name typo

03ecb82

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

VIDEO-13326 Remove S3 link usage #669

VIDEO-13326 Remove S3 link usage #669

asemivragovs commented Apr 18, 2024

dipankadas left a comment

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas Apr 18, 2024

dipankadas commented Apr 18, 2024

	FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources / = {isa = PBXBuildFile; fileRef = FB8AB08B2BD169920048DC49 / twilio_clound_com.mov */; };
	FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources / = {isa = PBXBuildFile; fileRef = FB8AB08B2BD169920048DC49 / twilio_cloud_com.mov */; };

	FB8AB08B2BD169920048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };
	FB8AB08B2BD169920048DC49 /* twilio_cloud_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_cloud_com.mov; path = Resources/twilio_cloud_com.mov; sourceTree = "<group>"; };

	FB8AB08C2BD169920048DC49 /* twilio_clound_com.mov in Resources */,
	FB8AB08C2BD169920048DC49 /* twilio_cloud_com.mov in Resources */,

	NSURL *contentUrl = [[NSBundle mainBundle] URLForResource:@"twilio_clound_com" withExtension:@"mov"];
	NSURL *contentUrl = [[NSBundle mainBundle] URLForResource:@"twilio_cloud_com" withExtension:@"mov"];

	FB8AB08A2BD1697F0048DC49 /* twilio_clound_com.mov in Resources / = {isa = PBXBuildFile; fileRef = FB8AB0892BD1697F0048DC49 / twilio_clound_com.mov */; };
	FB8AB08A2BD1697F0048DC49 /* twilio_cloud_com.mov in Resources / = {isa = PBXBuildFile; fileRef = FB8AB0892BD1697F0048DC49 / twilio_cloud_com.mov */; };

	FB8AB0892BD1697F0048DC49 /* twilio_clound_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_clound_com.mov; path = Resources/twilio_clound_com.mov; sourceTree = "<group>"; };
	FB8AB0892BD1697F0048DC49 /* twilio_cloud_com.mov */ = {isa = PBXFileReference; lastKnownFileType = video.quicktime; name = twilio_cloud_com.mov; path = Resources/twilio_cloud_com.mov; sourceTree = "<group>"; };

	let broadcastURL = Bundle.main.url(forResource: "twilio_clound_com", withExtension: "mov")
	let broadcastURL = Bundle.main.url(forResource: "twilio_cloud_com", withExtension: "mov")

VIDEO-13326 Remove S3 link usage #669

Are you sure you want to change the base?

VIDEO-13326 Remove S3 link usage #669

Conversation

asemivragovs commented Apr 18, 2024

Description

Breakdown

dipankadas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dipankadas commented Apr 18, 2024