mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 09:52:26 -05:00 
			
		
		
		
	[chore] bump dependencies (#4406)
- codeberg.org/gruf/go-ffmpreg: v0.6.9 -> v0.6.10
- github.com/ncruces/go-sqlite3: v0.27.1 -> v0.28.0
- github.com/stretchr/testify: v1.10.0 -> v1.11.1
- github.com/tdewolff/minify/v2 v2.23.11 -> v2.24.2
- go.opentelemetry.io/otel{,/*}: v1.37.0 -> v1.38.0
- go.opentelemetry.io/contrib/*: v0.62.0 -> v0.63.0
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4406
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
	
	
This commit is contained in:
		
					parent
					
						
							
								5a54e7156b
							
						
					
				
			
			
				commit
				
					
						78defcd916
					
				
			
		
					 274 changed files with 9213 additions and 2368 deletions
				
			
		
							
								
								
									
										30
									
								
								vendor/google.golang.org/grpc/credentials/tls.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								vendor/google.golang.org/grpc/credentials/tls.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -110,14 +110,14 @@ func (c tlsCreds) Info() ProtocolInfo { | |||
| func (c *tlsCreds) ClientHandshake(ctx context.Context, authority string, rawConn net.Conn) (_ net.Conn, _ AuthInfo, err error) { | ||||
| 	// use local cfg to avoid clobbering ServerName if using multiple endpoints | ||||
| 	cfg := credinternal.CloneTLSConfig(c.config) | ||||
| 	if cfg.ServerName == "" { | ||||
| 		serverName, _, err := net.SplitHostPort(authority) | ||||
| 		if err != nil { | ||||
| 			// If the authority had no host port or if the authority cannot be parsed, use it as-is. | ||||
| 			serverName = authority | ||||
| 		} | ||||
| 		cfg.ServerName = serverName | ||||
| 
 | ||||
| 	serverName, _, err := net.SplitHostPort(authority) | ||||
| 	if err != nil { | ||||
| 		// If the authority had no host port or if the authority cannot be parsed, use it as-is. | ||||
| 		serverName = authority | ||||
| 	} | ||||
| 	cfg.ServerName = serverName | ||||
| 
 | ||||
| 	conn := tls.Client(rawConn, cfg) | ||||
| 	errChannel := make(chan error, 1) | ||||
| 	go func() { | ||||
|  | @ -259,9 +259,11 @@ func applyDefaults(c *tls.Config) *tls.Config { | |||
| // certificates to establish the identity of the client need to be included in | ||||
| // the credentials (eg: for mTLS), use NewTLS instead, where a complete | ||||
| // tls.Config can be specified. | ||||
| // serverNameOverride is for testing only. If set to a non empty string, | ||||
| // it will override the virtual host name of authority (e.g. :authority header | ||||
| // field) in requests. | ||||
| // | ||||
| // serverNameOverride is for testing only. If set to a non empty string, it will | ||||
| // override the virtual host name of authority (e.g. :authority header field) in | ||||
| // requests.  Users should use grpc.WithAuthority passed to grpc.NewClient to | ||||
| // override the authority of the client instead. | ||||
| func NewClientTLSFromCert(cp *x509.CertPool, serverNameOverride string) TransportCredentials { | ||||
| 	return NewTLS(&tls.Config{ServerName: serverNameOverride, RootCAs: cp}) | ||||
| } | ||||
|  | @ -271,9 +273,11 @@ func NewClientTLSFromCert(cp *x509.CertPool, serverNameOverride string) Transpor | |||
| // certificates to establish the identity of the client need to be included in | ||||
| // the credentials (eg: for mTLS), use NewTLS instead, where a complete | ||||
| // tls.Config can be specified. | ||||
| // serverNameOverride is for testing only. If set to a non empty string, | ||||
| // it will override the virtual host name of authority (e.g. :authority header | ||||
| // field) in requests. | ||||
| // | ||||
| // serverNameOverride is for testing only. If set to a non empty string, it will | ||||
| // override the virtual host name of authority (e.g. :authority header field) in | ||||
| // requests.  Users should use grpc.WithAuthority passed to grpc.NewClient to | ||||
| // override the authority of the client instead. | ||||
| func NewClientTLSFromFile(certFile, serverNameOverride string) (TransportCredentials, error) { | ||||
| 	b, err := os.ReadFile(certFile) | ||||
| 	if err != nil { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue