mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	Merge pull request #129430 from MadhavJivrajani/go124-webhook-regex-ut
[go1.24] webhook: alter regex to account for x509sha1 GODEBUG removal
This commit is contained in:
		@@ -406,14 +406,14 @@ func TestTLSConfig(t *testing.T) {
 | 
				
			|||||||
			test:       "server cert with SHA1 signature",
 | 
								test:       "server cert with SHA1 signature",
 | 
				
			||||||
			clientCA:   caCert,
 | 
								clientCA:   caCert,
 | 
				
			||||||
			serverCert: append(append(sha1ServerCertInter, byte('\n')), caCertInter...), serverKey: serverKey,
 | 
								serverCert: append(append(sha1ServerCertInter, byte('\n')), caCertInter...), serverKey: serverKey,
 | 
				
			||||||
			errRegex:                         "x509: cannot verify signature: insecure algorithm SHA1-RSA \\(temporarily override with GODEBUG=x509sha1=1\\)",
 | 
								errRegex:                         "x509: cannot verify signature: insecure algorithm SHA1-RSA",
 | 
				
			||||||
			increaseSHA1SignatureWarnCounter: true,
 | 
								increaseSHA1SignatureWarnCounter: true,
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
		{
 | 
							{
 | 
				
			||||||
			test:       "server cert signed by an intermediate CA with SHA1 signature",
 | 
								test:       "server cert signed by an intermediate CA with SHA1 signature",
 | 
				
			||||||
			clientCA:   caCert,
 | 
								clientCA:   caCert,
 | 
				
			||||||
			serverCert: append(append(serverCertInterSHA1, byte('\n')), caCertInterSHA1...), serverKey: serverKey,
 | 
								serverCert: append(append(serverCertInterSHA1, byte('\n')), caCertInterSHA1...), serverKey: serverKey,
 | 
				
			||||||
			errRegex:                         "x509: cannot verify signature: insecure algorithm SHA1-RSA \\(temporarily override with GODEBUG=x509sha1=1\\)",
 | 
								errRegex:                         "x509: cannot verify signature: insecure algorithm SHA1-RSA",
 | 
				
			||||||
			increaseSHA1SignatureWarnCounter: true,
 | 
								increaseSHA1SignatureWarnCounter: true,
 | 
				
			||||||
		},
 | 
							},
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user