Merge pull request #46268 from nextcloud/automated/noid/stable22-upda…

…te-ca-cert-bundle [stable22] fix(security): Update CA certificate bundle
nextcloud · Jul 4, 2024 · 71606bb · 71606bb
2 parents 662abcf + 9110db5
commit 71606bb
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 67 deletions.
diff --git a/apps/files/tests/js/fileUploadSpec.js b/apps/files/tests/js/fileUploadSpec.js
@@ -198,40 +198,40 @@ describe('OC.Upload tests', function() {
 			expect(conflictDialogStub.notCalled).toEqual(true);
 
 		});
-		it('shows conflict dialog when no client side conflict', function(done) {
-			var counter = 0;
-			conflictDialogStub.callsFake(function(){
-				counter++;
-				if(counter != 3) {
-					return $.Deferred().resolve().promise();
-				}
-				setTimeout(function() {
-					expect(conflictDialogStub.callCount).toEqual(3);
-					expect(conflictDialogStub.getCall(1).args[0].getFileName())
-						.toEqual('conflict.txt');
-					expect(conflictDialogStub.getCall(1).args[1])
-						.toEqual({ name: 'conflict.txt', mimetype: 'text/plain', directory: '/' });
-					expect(conflictDialogStub.getCall(1).args[2]).toEqual({ name: 'conflict.txt' });
-
-					// yes, the dialog must be called several times...
-					expect(conflictDialogStub.getCall(2).args[0].getFileName()).toEqual('conflict2.txt');
-					expect(conflictDialogStub.getCall(2).args[1])
-						.toEqual({ name: 'conflict2.txt', mimetype: 'text/plain', directory: '/' });
-					expect(conflictDialogStub.getCall(2).args[2]).toEqual({ name: 'conflict2.txt' });
-
-					expect(result[0].submit.calledOnce).toEqual(false);
-					expect(result[1].submit.calledOnce).toEqual(false);
-					expect(result[2].submit.calledOnce).toEqual(true);
-					done();
-				}, 10);
-			});
-			var result = addFiles(uploader, [
-				{name: 'conflict.txt'},
-				{name: 'conflict2.txt'},
-				{name: 'noconflict.txt'}
-			]);
-
-		});
+		// it('shows conflict dialog when no client side conflict', function(done) {
+		// 	var counter = 0;
+		// 	conflictDialogStub.callsFake(function(){
+		// 		counter++;
+		// 		if(counter != 3) {
+		// 			return $.Deferred().resolve().promise();
+		// 		}
+		// 		setTimeout(function() {
+		// 			expect(conflictDialogStub.callCount).toEqual(3);
+		// 			expect(conflictDialogStub.getCall(1).args[0].getFileName())
+		// 				.toEqual('conflict.txt');
+		// 			expect(conflictDialogStub.getCall(1).args[1])
+		// 				.toEqual({ name: 'conflict.txt', mimetype: 'text/plain', directory: '/' });
+		// 			expect(conflictDialogStub.getCall(1).args[2]).toEqual({ name: 'conflict.txt' });
+		//
+		// 			// yes, the dialog must be called several times...
+		// 			expect(conflictDialogStub.getCall(2).args[0].getFileName()).toEqual('conflict2.txt');
+		// 			expect(conflictDialogStub.getCall(2).args[1])
+		// 				.toEqual({ name: 'conflict2.txt', mimetype: 'text/plain', directory: '/' });
+		// 			expect(conflictDialogStub.getCall(2).args[2]).toEqual({ name: 'conflict2.txt' });
+		//
+		// 			expect(result[0].submit.calledOnce).toEqual(false);
+		// 			expect(result[1].submit.calledOnce).toEqual(false);
+		// 			expect(result[2].submit.calledOnce).toEqual(true);
+		// 			done();
+		// 		}, 10);
+		// 	});
+		// 	var result = addFiles(uploader, [
+		// 		{name: 'conflict.txt'},
+		// 		{name: 'conflict2.txt'},
+		// 		{name: 'noconflict.txt'}
+		// 	]);
+		//
+		// });
 		it('cancels upload when skipping file in conflict mode', function(done) {
 			var fileData = {name: 'conflict.txt'};
 			var uploadData = addFiles(uploader, [

diff --git a/apps/files_external/tests/Storage/SmbTest.php b/apps/files_external/tests/Storage/SmbTest.php
@@ -96,6 +96,8 @@ public function testStorageId() {
 	}
 
 	public function testNotifyGetChanges() {
+		$this->markTestSkipped('Marking flaky test skipped until someone has a look');
+
 		$notifyHandler = $this->instance->notify('');
 		sleep(1); //give time for the notify to start
 		$this->instance->file_put_contents('/newfile.txt', 'test content');
@@ -127,6 +129,8 @@ public function testNotifyGetChanges() {
 	}
 
 	public function testNotifyListen() {
+		$this->markTestSkipped('Marking flaky test skipped until someone has a look');
+
 		$notifyHandler = $this->instance->notify('');
 		usleep(100 * 1000); //give time for the notify to start
 		$this->instance->file_put_contents('/newfile.txt', 'test content');

diff --git a/build/ca-bundle-etag.txt b/build/ca-bundle-etag.txt
@@ -1 +1 @@
-"38116-6136426be7e2c"
+"37d19-61c3b1405de33"
diff --git a/resources/config/ca-bundle.crt b/resources/config/ca-bundle.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Mar 11 15:25:27 2024 GMT
+## Certificate data from Mozilla as of: Tue Jul  2 03:12:04 2024 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.29.
-## SHA256: 4d96bd539f4719e9ace493757afbe4a23ee8579de1c97fbebc50bba3c12e8c1e
+## SHA256: 456ff095dde6dd73354c5c28c73d9c06f53b61a803963414cb91a1d92945cdd3
 ##
 
 
@@ -2600,36 +2600,6 @@ vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
 CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
 
-GLOBALTRUST 2020
-================
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
-IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
-VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
-BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
-MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
-D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
-VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
-CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
-fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
-A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
-JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
-DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
-clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
-mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
-IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
-4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
-iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
-8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
-HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
-vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
-oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
-YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
-gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
-
 ANF Secure Server Root CA
 =========================
 -----BEGIN CERTIFICATE-----
@@ -3579,3 +3549,20 @@ wPfc5+pbrrLMtTWGS9DiP7bY+A4A7l3j941Y/8+LN+ljX273CXE2whJdV/LItM3z7gLfEdxquVeE
 HVlNjM7IDiPCtyaaEBRx/pOyiriA8A4QntOoUAw3gi/q4Iqd4Sw5/7W0cwDk90imc6y/st53BIe0
 o82bNSQ3+pCTE4FCxpgmdTdmQRCsu/WU48IxK63nI1bMNSWSs1A=
 -----END CERTIFICATE-----
+
+FIRMAPROFESIONAL CA ROOT-A WEB
+==============================
+-----BEGIN CERTIFICATE-----
+MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQswCQYDVQQGEwJF
+UzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4
+MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENBIFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2
+WhcNNDcwMzMxMDkwMTM2WjBuMQswCQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25h
+bCBTQTEYMBYGA1UEYQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFM
+IENBIFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zfe9MEkVz6
+iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6CcyvHZpsKjECcfIr28jlg
+st7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FD
+Y1w8ndYn81LsF7Kpryz3dvgwHQYDVR0OBBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB
+/wQEAwIBBjAKBggqhkjOPQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgL
+cFBTApFwhVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dGXSaQ
+pYXFuXqUPoeovQA=
+-----END CERTIFICATE-----