mirror of
https://github.com/netbirdio/netbird.git
synced 2026-04-16 07:16:38 +00:00
[proxy] remove unused oidc config flags (#5369)
This commit is contained in:
@@ -6,14 +6,14 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"os/signal"
|
"os/signal"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
|
||||||
"syscall"
|
"syscall"
|
||||||
|
|
||||||
"github.com/netbirdio/netbird/shared/management/domain"
|
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
"golang.org/x/crypto/acme"
|
"golang.org/x/crypto/acme"
|
||||||
|
|
||||||
|
"github.com/netbirdio/netbird/shared/management/domain"
|
||||||
|
|
||||||
"github.com/netbirdio/netbird/proxy"
|
"github.com/netbirdio/netbird/proxy"
|
||||||
nbacme "github.com/netbirdio/netbird/proxy/internal/acme"
|
nbacme "github.com/netbirdio/netbird/proxy/internal/acme"
|
||||||
"github.com/netbirdio/netbird/util"
|
"github.com/netbirdio/netbird/util"
|
||||||
@@ -46,10 +46,6 @@ var (
|
|||||||
debugEndpoint bool
|
debugEndpoint bool
|
||||||
debugEndpointAddr string
|
debugEndpointAddr string
|
||||||
healthAddr string
|
healthAddr string
|
||||||
oidcClientID string
|
|
||||||
oidcClientSecret string
|
|
||||||
oidcEndpoint string
|
|
||||||
oidcScopes string
|
|
||||||
forwardedProto string
|
forwardedProto string
|
||||||
trustedProxies string
|
trustedProxies string
|
||||||
certFile string
|
certFile string
|
||||||
@@ -81,10 +77,6 @@ func init() {
|
|||||||
rootCmd.Flags().BoolVar(&debugEndpoint, "debug-endpoint", envBoolOrDefault("NB_PROXY_DEBUG_ENDPOINT", false), "Enable debug HTTP endpoint")
|
rootCmd.Flags().BoolVar(&debugEndpoint, "debug-endpoint", envBoolOrDefault("NB_PROXY_DEBUG_ENDPOINT", false), "Enable debug HTTP endpoint")
|
||||||
rootCmd.Flags().StringVar(&debugEndpointAddr, "debug-endpoint-addr", envStringOrDefault("NB_PROXY_DEBUG_ENDPOINT_ADDRESS", "localhost:8444"), "Address for the debug HTTP endpoint")
|
rootCmd.Flags().StringVar(&debugEndpointAddr, "debug-endpoint-addr", envStringOrDefault("NB_PROXY_DEBUG_ENDPOINT_ADDRESS", "localhost:8444"), "Address for the debug HTTP endpoint")
|
||||||
rootCmd.Flags().StringVar(&healthAddr, "health-addr", envStringOrDefault("NB_PROXY_HEALTH_ADDRESS", "localhost:8080"), "Address for the health probe endpoint (liveness/readiness/startup)")
|
rootCmd.Flags().StringVar(&healthAddr, "health-addr", envStringOrDefault("NB_PROXY_HEALTH_ADDRESS", "localhost:8080"), "Address for the health probe endpoint (liveness/readiness/startup)")
|
||||||
rootCmd.Flags().StringVar(&oidcClientID, "oidc-id", envStringOrDefault("NB_PROXY_OIDC_CLIENT_ID", "netbird-proxy"), "The OAuth2 Client ID for OIDC User Authentication")
|
|
||||||
rootCmd.Flags().StringVar(&oidcClientSecret, "oidc-secret", envStringOrDefault("NB_PROXY_OIDC_CLIENT_SECRET", ""), "The OAuth2 Client Secret for OIDC User Authentication")
|
|
||||||
rootCmd.Flags().StringVar(&oidcEndpoint, "oidc-endpoint", envStringOrDefault("NB_PROXY_OIDC_ENDPOINT", ""), "The OIDC Endpoint for OIDC User Authentication")
|
|
||||||
rootCmd.Flags().StringVar(&oidcScopes, "oidc-scopes", envStringOrDefault("NB_PROXY_OIDC_SCOPES", "openid,profile,email"), "The OAuth2 scopes for OIDC User Authentication, comma separated")
|
|
||||||
rootCmd.Flags().StringVar(&forwardedProto, "forwarded-proto", envStringOrDefault("NB_PROXY_FORWARDED_PROTO", "auto"), "X-Forwarded-Proto value for backends: auto, http, or https")
|
rootCmd.Flags().StringVar(&forwardedProto, "forwarded-proto", envStringOrDefault("NB_PROXY_FORWARDED_PROTO", "auto"), "X-Forwarded-Proto value for backends: auto, http, or https")
|
||||||
rootCmd.Flags().StringVar(&trustedProxies, "trusted-proxies", envStringOrDefault("NB_PROXY_TRUSTED_PROXIES", ""), "Comma-separated list of trusted upstream proxy CIDR ranges (e.g. '10.0.0.0/8,192.168.1.1')")
|
rootCmd.Flags().StringVar(&trustedProxies, "trusted-proxies", envStringOrDefault("NB_PROXY_TRUSTED_PROXIES", ""), "Comma-separated list of trusted upstream proxy CIDR ranges (e.g. '10.0.0.0/8,192.168.1.1')")
|
||||||
rootCmd.Flags().StringVar(&certFile, "cert-file", envStringOrDefault("NB_PROXY_CERTIFICATE_FILE", "tls.crt"), "TLS certificate filename within the certificate directory")
|
rootCmd.Flags().StringVar(&certFile, "cert-file", envStringOrDefault("NB_PROXY_CERTIFICATE_FILE", "tls.crt"), "TLS certificate filename within the certificate directory")
|
||||||
@@ -159,10 +151,6 @@ func runServer(cmd *cobra.Command, args []string) error {
|
|||||||
DebugEndpointEnabled: debugEndpoint,
|
DebugEndpointEnabled: debugEndpoint,
|
||||||
DebugEndpointAddress: debugEndpointAddr,
|
DebugEndpointAddress: debugEndpointAddr,
|
||||||
HealthAddress: healthAddr,
|
HealthAddress: healthAddr,
|
||||||
OIDCClientId: oidcClientID,
|
|
||||||
OIDCClientSecret: oidcClientSecret,
|
|
||||||
OIDCEndpoint: oidcEndpoint,
|
|
||||||
OIDCScopes: strings.Split(oidcScopes, ","),
|
|
||||||
ForwardedProto: forwardedProto,
|
ForwardedProto: forwardedProto,
|
||||||
TrustedProxies: parsedTrustedProxies,
|
TrustedProxies: parsedTrustedProxies,
|
||||||
CertLockMethod: nbacme.CertLockMethod(certLockMethod),
|
CertLockMethod: nbacme.CertLockMethod(certLockMethod),
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ import (
|
|||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/cenkalti/backoff/v4"
|
"github.com/cenkalti/backoff/v4"
|
||||||
proxyproto "github.com/pires/go-proxyproto"
|
"github.com/pires/go-proxyproto"
|
||||||
"github.com/prometheus/client_golang/prometheus"
|
"github.com/prometheus/client_golang/prometheus"
|
||||||
"github.com/prometheus/client_golang/prometheus/promhttp"
|
"github.com/prometheus/client_golang/prometheus/promhttp"
|
||||||
log "github.com/sirupsen/logrus"
|
log "github.com/sirupsen/logrus"
|
||||||
@@ -89,11 +89,7 @@ type Server struct {
|
|||||||
ACMEChallengeType string
|
ACMEChallengeType string
|
||||||
// CertLockMethod controls how ACME certificate locks are coordinated
|
// CertLockMethod controls how ACME certificate locks are coordinated
|
||||||
// across replicas. Default: CertLockAuto (detect environment).
|
// across replicas. Default: CertLockAuto (detect environment).
|
||||||
CertLockMethod acme.CertLockMethod
|
CertLockMethod acme.CertLockMethod
|
||||||
OIDCClientId string
|
|
||||||
OIDCClientSecret string
|
|
||||||
OIDCEndpoint string
|
|
||||||
OIDCScopes []string
|
|
||||||
|
|
||||||
// DebugEndpointEnabled enables the debug HTTP endpoint.
|
// DebugEndpointEnabled enables the debug HTTP endpoint.
|
||||||
DebugEndpointEnabled bool
|
DebugEndpointEnabled bool
|
||||||
|
|||||||
Reference in New Issue
Block a user