Update the osbuild/images to the version which introduces "dot notation" for distro release versions. - Replace all uses of distroregistry by distrofactory. - Delete local version of reporegistry and use the one from the osbuild/images. - Weldr: unify `createWeldrAPI()` and `createWeldrAPI2()` into a single `createTestWeldrAPI()` function`. - store/fixture: rework fixtures to allow overriding the host distro name and host architecture name. A cleanup function to restore the host distro and arch names is always part of the fixture struct. - Delete `distro_mock` package, since it is no longer used. - Bump the required version of osbuild to 98, because the OSCAP customization is using the 'compress_results' stage option, which is not available in older versions of osbuild. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
42 lines
1.1 KiB
Go
42 lines
1.1 KiB
Go
// Copyright 2011 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package proxy
|
|
|
|
import (
|
|
"context"
|
|
"net"
|
|
|
|
"golang.org/x/net/internal/socks"
|
|
)
|
|
|
|
// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given
|
|
// address with an optional username and password.
|
|
// See RFC 1928 and RFC 1929.
|
|
func SOCKS5(network, address string, auth *Auth, forward Dialer) (Dialer, error) {
|
|
d := socks.NewDialer(network, address)
|
|
if forward != nil {
|
|
if f, ok := forward.(ContextDialer); ok {
|
|
d.ProxyDial = func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return f.DialContext(ctx, network, address)
|
|
}
|
|
} else {
|
|
d.ProxyDial = func(ctx context.Context, network string, address string) (net.Conn, error) {
|
|
return dialContext(ctx, forward, network, address)
|
|
}
|
|
}
|
|
}
|
|
if auth != nil {
|
|
up := socks.UsernamePassword{
|
|
Username: auth.User,
|
|
Password: auth.Password,
|
|
}
|
|
d.AuthMethods = []socks.AuthMethod{
|
|
socks.AuthMethodNotRequired,
|
|
socks.AuthMethodUsernamePassword,
|
|
}
|
|
d.Authenticate = up.Authenticate
|
|
}
|
|
return d, nil
|
|
}
|