mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 19:12:26 -05:00 
			
		
		
		
	[chore] update dependencies (#4188)
Update dependencies:
- github.com/gin-gonic/gin v1.10.0 -> v1.10.1
- github.com/gin-contrib/sessions v1.10.3 -> v1.10.4
- github.com/jackc/pgx/v5 v5.7.4 -> v5.7.5
- github.com/minio/minio-go/v7 v7.0.91 -> v7.0.92
- github.com/pquerna/otp v1.4.0 -> v1.5.0
- github.com/tdewolff/minify/v2 v2.23.5 -> v2.23.8
- github.com/yuin/goldmark v1.7.11 -> v1.7.12
- go.opentelemetry.io/otel{,/*} v1.35.0 -> v1.36.0
- modernc.org/sqlite v1.37.0 -> v1.37.1
Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4188
Reviewed-by: Daenney <daenney@noreply.codeberg.org>
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
	
	
This commit is contained in:
		
					parent
					
						
							
								20aad9be0f
							
						
					
				
			
			
				commit
				
					
						b6ff55662e
					
				
			
		
					 214 changed files with 44839 additions and 32023 deletions
				
			
		
							
								
								
									
										17
									
								
								vendor/github.com/jackc/pgx/v5/pgconn/config.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										17
									
								
								vendor/github.com/jackc/pgx/v5/pgconn/config.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -51,6 +51,8 @@ type Config struct { | |||
| 	KerberosSpn     string | ||||
| 	Fallbacks       []*FallbackConfig | ||||
| 
 | ||||
| 	SSLNegotiation string // sslnegotiation=postgres or sslnegotiation=direct | ||||
| 
 | ||||
| 	// ValidateConnect is called during a connection attempt after a successful authentication with the PostgreSQL server. | ||||
| 	// It can be used to validate that the server is acceptable. If this returns an error the connection is closed and the next | ||||
| 	// fallback config is tried. This allows implementing high availability behavior such as libpq does with target_session_attrs. | ||||
|  | @ -198,9 +200,11 @@ func NetworkAddress(host string, port uint16) (network, address string) { | |||
| //	PGSSLKEY | ||||
| //	PGSSLROOTCERT | ||||
| //	PGSSLPASSWORD | ||||
| //	PGOPTIONS | ||||
| //	PGAPPNAME | ||||
| //	PGCONNECT_TIMEOUT | ||||
| //	PGTARGETSESSIONATTRS | ||||
| //	PGTZ | ||||
| // | ||||
| // See http://www.postgresql.org/docs/11/static/libpq-envars.html for details on the meaning of environment variables. | ||||
| // | ||||
|  | @ -318,6 +322,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con | |||
| 		"sslkey":               {}, | ||||
| 		"sslcert":              {}, | ||||
| 		"sslrootcert":          {}, | ||||
| 		"sslnegotiation":       {}, | ||||
| 		"sslpassword":          {}, | ||||
| 		"sslsni":               {}, | ||||
| 		"krbspn":               {}, | ||||
|  | @ -386,6 +391,7 @@ func ParseConfigWithOptions(connString string, options ParseConfigOptions) (*Con | |||
| 	config.Port = fallbacks[0].Port | ||||
| 	config.TLSConfig = fallbacks[0].TLSConfig | ||||
| 	config.Fallbacks = fallbacks[1:] | ||||
| 	config.SSLNegotiation = settings["sslnegotiation"] | ||||
| 
 | ||||
| 	passfile, err := pgpassfile.ReadPassfile(settings["passfile"]) | ||||
| 	if err == nil { | ||||
|  | @ -449,9 +455,12 @@ func parseEnvSettings() map[string]string { | |||
| 		"PGSSLSNI":             "sslsni", | ||||
| 		"PGSSLROOTCERT":        "sslrootcert", | ||||
| 		"PGSSLPASSWORD":        "sslpassword", | ||||
| 		"PGSSLNEGOTIATION":     "sslnegotiation", | ||||
| 		"PGTARGETSESSIONATTRS": "target_session_attrs", | ||||
| 		"PGSERVICE":            "service", | ||||
| 		"PGSERVICEFILE":        "servicefile", | ||||
| 		"PGTZ":                 "timezone", | ||||
| 		"PGOPTIONS":            "options", | ||||
| 	} | ||||
| 
 | ||||
| 	for envname, realname := range nameMap { | ||||
|  | @ -646,6 +655,7 @@ func configTLS(settings map[string]string, thisHost string, parseConfigOptions P | |||
| 	sslkey := settings["sslkey"] | ||||
| 	sslpassword := settings["sslpassword"] | ||||
| 	sslsni := settings["sslsni"] | ||||
| 	sslnegotiation := settings["sslnegotiation"] | ||||
| 
 | ||||
| 	// Match libpq default behavior | ||||
| 	if sslmode == "" { | ||||
|  | @ -657,6 +667,13 @@ func configTLS(settings map[string]string, thisHost string, parseConfigOptions P | |||
| 
 | ||||
| 	tlsConfig := &tls.Config{} | ||||
| 
 | ||||
| 	if sslnegotiation == "direct" { | ||||
| 		tlsConfig.NextProtos = []string{"postgresql"} | ||||
| 		if sslmode == "prefer" { | ||||
| 			sslmode = "require" | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if sslrootcert != "" { | ||||
| 		var caCertPool *x509.CertPool | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue