mirror of
https://github.com/Gouryella/drip.git
synced 2026-02-24 05:10:43 +00:00
307cf8e6cc
- Add Bearer Token authentication, supporting tunnel access control via the --auth-bearer parameter - Refactor large modules into smaller, more focused components to improve code maintainability - Update dependency versions, including golang.org/x/crypto, golang.org/x/net, etc. - Add SilenceUsage and SilenceErrors configuration for all CLI commands - Modify connector configuration structure to support the new authentication method - Update recent change log in README with new feature descriptions BREAKING CHANGE: Authentication via Bearer Token is now supported, requiring the new --auth-bearer parameter
121 lines
3.7 KiB
Go
121 lines
3.7 KiB
Go
package cli
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"drip/internal/client/tcp"
|
|
"drip/internal/shared/protocol"
|
|
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
var (
|
|
subdomain string
|
|
daemonMode bool
|
|
daemonMarker bool
|
|
localAddress string
|
|
allowIPs []string
|
|
denyIPs []string
|
|
authPass string
|
|
authBearer string
|
|
transport string
|
|
)
|
|
|
|
var httpCmd = &cobra.Command{
|
|
Use: "http <port>",
|
|
Short: "Start HTTP tunnel",
|
|
Long: `Start an HTTP tunnel to expose a local HTTP server.
|
|
|
|
Example:
|
|
drip http 3000 Tunnel localhost:3000
|
|
drip http 8080 --subdomain myapp Use custom subdomain
|
|
drip http 3000 --allow-ip 192.168.0.0/16 Only allow IPs from 192.168.x.x
|
|
drip http 3000 --allow-ip 10.0.0.1 Allow single IP
|
|
drip http 3000 --deny-ip 1.2.3.4 Block specific IP
|
|
drip http 3000 --auth secret Enable proxy authentication with password
|
|
drip http 3000 --auth-bearer sk-xxx Enable proxy authentication with bearer token
|
|
drip http 3000 --transport wss Use WebSocket over TLS (CDN-friendly)
|
|
|
|
Configuration:
|
|
First time: Run 'drip config init' to save server and token
|
|
Subsequent: Just run 'drip http <port>'
|
|
|
|
Transport options:
|
|
auto - Automatically select based on server address (default)
|
|
tcp - Direct TLS 1.3 connection
|
|
wss - WebSocket over TLS (works through CDN like Cloudflare)`,
|
|
Args: cobra.ExactArgs(1),
|
|
RunE: runHTTP,
|
|
SilenceUsage: true,
|
|
SilenceErrors: true,
|
|
}
|
|
|
|
func init() {
|
|
httpCmd.Flags().StringVarP(&subdomain, "subdomain", "n", "", "Custom subdomain (optional)")
|
|
httpCmd.Flags().BoolVarP(&daemonMode, "daemon", "d", false, "Run in background (daemon mode)")
|
|
httpCmd.Flags().StringVarP(&localAddress, "address", "a", "127.0.0.1", "Local address to forward to (default: 127.0.0.1)")
|
|
httpCmd.Flags().StringSliceVar(&allowIPs, "allow-ip", nil, "Allow only these IPs or CIDR ranges (e.g., 192.168.1.1,10.0.0.0/8)")
|
|
httpCmd.Flags().StringSliceVar(&denyIPs, "deny-ip", nil, "Deny these IPs or CIDR ranges (e.g., 1.2.3.4,192.168.1.0/24)")
|
|
httpCmd.Flags().StringVar(&authPass, "auth", "", "Password for proxy authentication")
|
|
httpCmd.Flags().StringVar(&authBearer, "auth-bearer", "", "Bearer token for proxy authentication")
|
|
httpCmd.Flags().StringVar(&transport, "transport", "auto", "Transport protocol: auto, tcp, wss (WebSocket over TLS)")
|
|
httpCmd.Flags().BoolVar(&daemonMarker, "daemon-child", false, "Internal flag for daemon child process")
|
|
httpCmd.Flags().MarkHidden("daemon-child")
|
|
rootCmd.AddCommand(httpCmd)
|
|
}
|
|
|
|
func runHTTP(_ *cobra.Command, args []string) error {
|
|
port, err := strconv.Atoi(args[0])
|
|
if err != nil || port < 1 || port > 65535 {
|
|
return fmt.Errorf("invalid port number: %s", args[0])
|
|
}
|
|
|
|
if daemonMode && !daemonMarker {
|
|
return StartDaemon("http", port, buildDaemonArgs("http", args, subdomain, localAddress))
|
|
}
|
|
|
|
if authPass != "" && authBearer != "" {
|
|
return fmt.Errorf("cannot use --auth and --auth-bearer together")
|
|
}
|
|
|
|
serverAddr, token, err := resolveServerAddrAndToken("http", port)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
connConfig := &tcp.ConnectorConfig{
|
|
ServerAddr: serverAddr,
|
|
Token: token,
|
|
TunnelType: protocol.TunnelTypeHTTP,
|
|
LocalHost: localAddress,
|
|
LocalPort: port,
|
|
Subdomain: subdomain,
|
|
Insecure: insecure,
|
|
AllowIPs: allowIPs,
|
|
DenyIPs: denyIPs,
|
|
AuthPass: authPass,
|
|
AuthBearer: authBearer,
|
|
Transport: parseTransport(transport),
|
|
}
|
|
|
|
var daemon *DaemonInfo
|
|
if daemonMarker {
|
|
daemon = newDaemonInfo("http", port, subdomain, serverAddr)
|
|
}
|
|
|
|
return runTunnelWithUI(connConfig, daemon)
|
|
}
|
|
|
|
func parseTransport(s string) tcp.TransportType {
|
|
switch strings.ToLower(s) {
|
|
case "wss":
|
|
return tcp.TransportWebSocket
|
|
case "tcp", "tls":
|
|
return tcp.TransportTCP
|
|
default:
|
|
return tcp.TransportAuto
|
|
}
|
|
}
|