|
1 | 1 | package proxydns |
2 | 2 |
|
3 | 3 | import ( |
4 | | - "context" |
5 | | - "net" |
6 | | - "os" |
7 | | - "os/signal" |
8 | | - "syscall" |
| 4 | + "errors" |
9 | 5 |
|
10 | 6 | "github.com/urfave/cli/v2" |
| 7 | + "github.com/urfave/cli/v2/altsrc" |
11 | 8 |
|
12 | 9 | "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" |
13 | 10 | "github.com/cloudflare/cloudflared/logger" |
14 | | - "github.com/cloudflare/cloudflared/metrics" |
15 | | - "github.com/cloudflare/cloudflared/tunneldns" |
16 | 11 | ) |
17 | 12 |
|
18 | | -func Command(hidden bool) *cli.Command { |
19 | | - return &cli.Command{ |
20 | | - Name: "proxy-dns", |
21 | | - Action: cliutil.ConfiguredAction(Run), |
| 13 | +const removedMessage = "dns-proxy feature is not supported, since version 2026.2.0" |
22 | 14 |
|
23 | | - Usage: "Run a DNS over HTTPS proxy server.", |
24 | | - Flags: []cli.Flag{ |
25 | | - &cli.StringFlag{ |
26 | | - Name: "metrics", |
27 | | - Value: "localhost:", |
28 | | - Usage: "Listen address for metrics reporting.", |
29 | | - EnvVars: []string{"TUNNEL_METRICS"}, |
30 | | - }, |
31 | | - &cli.StringFlag{ |
32 | | - Name: "address", |
33 | | - Usage: "Listen address for the DNS over HTTPS proxy server.", |
34 | | - Value: "localhost", |
35 | | - EnvVars: []string{"TUNNEL_DNS_ADDRESS"}, |
36 | | - }, |
37 | | - // Note TUN-3758 , we use Int because UInt is not supported with altsrc |
38 | | - &cli.IntFlag{ |
39 | | - Name: "port", |
40 | | - Usage: "Listen on given port for the DNS over HTTPS proxy server.", |
41 | | - Value: 53, |
42 | | - EnvVars: []string{"TUNNEL_DNS_PORT"}, |
43 | | - }, |
44 | | - &cli.StringSliceFlag{ |
45 | | - Name: "upstream", |
46 | | - Usage: "Upstream endpoint URL, you can specify multiple endpoints for redundancy.", |
47 | | - Value: cli.NewStringSlice("https://1.1.1.1/dns-query", "https://1.0.0.1/dns-query"), |
48 | | - EnvVars: []string{"TUNNEL_DNS_UPSTREAM"}, |
49 | | - }, |
50 | | - &cli.StringSliceFlag{ |
51 | | - Name: "bootstrap", |
52 | | - Usage: "bootstrap endpoint URL, you can specify multiple endpoints for redundancy.", |
53 | | - Value: cli.NewStringSlice("https://162.159.36.1/dns-query", "https://162.159.46.1/dns-query", "https://[2606:4700:4700::1111]/dns-query", "https://[2606:4700:4700::1001]/dns-query"), |
54 | | - EnvVars: []string{"TUNNEL_DNS_BOOTSTRAP"}, |
55 | | - }, |
56 | | - &cli.IntFlag{ |
57 | | - Name: "max-upstream-conns", |
58 | | - Usage: "Maximum concurrent connections to upstream. Setting to 0 means unlimited.", |
59 | | - Value: tunneldns.MaxUpstreamConnsDefault, |
60 | | - EnvVars: []string{"TUNNEL_DNS_MAX_UPSTREAM_CONNS"}, |
61 | | - }, |
62 | | - }, |
63 | | - ArgsUsage: " ", // can't be the empty string or we get the default output |
64 | | - Hidden: hidden, |
| 15 | +func Command() *cli.Command { |
| 16 | + return &cli.Command{ |
| 17 | + Name: "proxy-dns", |
| 18 | + Action: cliutil.ConfiguredAction(Run), |
| 19 | + Usage: removedMessage, |
| 20 | + SkipFlagParsing: true, |
65 | 21 | } |
66 | 22 | } |
67 | 23 |
|
68 | | -// Run implements a foreground runner |
69 | 24 | func Run(c *cli.Context) error { |
70 | 25 | log := logger.CreateLoggerFromContext(c, logger.EnableTerminalLog) |
| 26 | + err := errors.New(removedMessage) |
| 27 | + log.Err(err).Msg("DNS Proxy is no longer supported") |
71 | 28 |
|
72 | | - metricsListener, err := net.Listen("tcp", c.String("metrics")) |
73 | | - if err != nil { |
74 | | - log.Fatal().Err(err).Msg("Failed to open the metrics listener") |
75 | | - } |
76 | | - |
77 | | - go metrics.ServeMetrics(metricsListener, context.Background(), metrics.Config{}, log) |
78 | | - |
79 | | - listener, err := tunneldns.CreateListener( |
80 | | - c.String("address"), |
81 | | - // Note TUN-3758 , we use Int because UInt is not supported with altsrc |
82 | | - uint16(c.Int("port")), |
83 | | - c.StringSlice("upstream"), |
84 | | - c.StringSlice("bootstrap"), |
85 | | - c.Int("max-upstream-conns"), |
86 | | - log, |
87 | | - ) |
88 | | - |
89 | | - if err != nil { |
90 | | - log.Err(err).Msg("Failed to create the listeners") |
91 | | - return err |
92 | | - } |
93 | | - |
94 | | - // Try to start the server |
95 | | - readySignal := make(chan struct{}) |
96 | | - err = listener.Start(readySignal) |
97 | | - if err != nil { |
98 | | - log.Err(err).Msg("Failed to start the listeners") |
99 | | - return listener.Stop() |
100 | | - } |
101 | | - <-readySignal |
102 | | - |
103 | | - // Wait for signal |
104 | | - signals := make(chan os.Signal, 10) |
105 | | - signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT) |
106 | | - defer signal.Stop(signals) |
107 | | - <-signals |
| 29 | + return err |
| 30 | +} |
108 | 31 |
|
109 | | - // Shut down server |
110 | | - err = listener.Stop() |
111 | | - if err != nil { |
112 | | - log.Err(err).Msg("failed to stop") |
| 32 | +// Old flags used by the proxy-dns command, only kept to not break any script that might be setting these flags |
| 33 | +func ConfigureProxyDNSFlags(shouldHide bool) []cli.Flag { |
| 34 | + return []cli.Flag{ |
| 35 | + altsrc.NewBoolFlag(&cli.BoolFlag{ |
| 36 | + Name: "proxy-dns", |
| 37 | + }), |
| 38 | + altsrc.NewIntFlag(&cli.IntFlag{ |
| 39 | + Name: "proxy-dns-port", |
| 40 | + }), |
| 41 | + altsrc.NewStringFlag(&cli.StringFlag{ |
| 42 | + Name: "proxy-dns-address", |
| 43 | + }), |
| 44 | + altsrc.NewStringSliceFlag(&cli.StringSliceFlag{ |
| 45 | + Name: "proxy-dns-upstream", |
| 46 | + }), |
| 47 | + altsrc.NewIntFlag(&cli.IntFlag{ |
| 48 | + Name: "proxy-dns-max-upstream-conns", |
| 49 | + }), |
| 50 | + altsrc.NewStringSliceFlag(&cli.StringSliceFlag{ |
| 51 | + Name: "proxy-dns-bootstrap", |
| 52 | + }), |
113 | 53 | } |
114 | | - return err |
115 | 54 | } |
0 commit comments