Config option for custom DNS resolver

LICENSE

@@ -1,201 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

go.mod

@@ -1,5 +1,3 @@
 module edgaru089.ink/go/regolith
 
 go 1.24.0
-
-require golang.org/x/net v0.43.0 // indirect

go.sum

@@ -1,2 +0,0 @@
-golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
-golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=

internal/http/server.go

@@ -3,7 +3,6 @@ package http
 import (
 	"bufio"
 	"bytes"
-	"context"
 	"errors"
 	"io"
 	"log"
@@ -13,7 +12,6 @@ import (
 	"time"
 
 	"edgaru089.ink/go/regolith/internal/perm"
-	"golang.org/x/net/proxy"
 )
 
 const (
@@ -23,8 +21,6 @@ const (
 var (
 	dialer      = net.Dialer{Timeout: outgoing_client_timeout}
 	http_client = http.Client{Timeout: outgoing_client_timeout}
-
-	dialer_func func(ctx context.Context, network, addr string) (net.Conn, error) = dialer.DialContext
 )
 
 type Server struct {
@@ -62,22 +58,6 @@ func (s *Server) Serve(listener net.Listener) (err error) {
 	}
 }
 
-// SetDialer sets the global dialer every Server uses to dial outgoing HTTP/CONNECT connections.
-//
-// When set to nil, net.Dial is used instead.
-func (s *Server) SetDialer(dialer proxy.ContextDialer) {
-	if http_client.Transport == nil {
-		http_client.Transport = http.DefaultTransport
-	}
-
-	http_client.Transport.(*http.Transport).DialContext = dialer.DialContext
-	if dialer != nil {
-		dialer_func = dialer.DialContext
-	} else {
-		dialer_func = dialer.DialContext
-	}
-}
-
 func (s *Server) dispatch(conn net.Conn) {
 	buf := bufio.NewReader(conn)
 	for {
@@ -176,9 +156,7 @@ func (s *Server) handle_connect(conn net.Conn, req *http.Request) {
 	}()
 
 	// dial
-	ctx, cancel := context.WithTimeout(context.Background(), outgoing_client_timeout)
+	remote_conn, err := dialer.Dial("tcp", req_addr)
-	remote_conn, err := dialer_func(ctx, "tcp", req_addr)
-	cancel()
 	if err != nil {
 		simple_respond(conn, req, http.StatusBadGateway)
 		close_err = err

internal/out/out.go

@@ -1,143 +0,0 @@
-package out
-
-import (
-	"context"
-	"log"
-	"net"
-	"net/url"
-	"sync"
-
-	"golang.org/x/net/proxy"
-
-	"edgaru089.ink/go/regolith/internal/util"
-)
-
-// Configures upstream TCP connections.
-//
-// Does not support HTTP proxies as upstream. They're
-// just a pain to use besides CONNECT commands.
-//
-// Upstreams are specified as 'direct' for direct dialing
-// by the Go net package, or 'socks5://user:pass@host:port'
-// for SOCKS5 upstreams.
-//
-// Numeric addresses are always dialed directly.
-type Config struct {
-	Default string              // Default URI
-	Proxied map[string][]string // Proxy URI to hostname array mapping
-}
-
-// Dialer implements x/net/proxy.Dialer from the Config given to it.
-type Dialer struct {
-	lock sync.RWMutex
-
-	hostnames map[string]string
-	uris      map[string]interface {
-		proxy.Dialer
-		proxy.ContextDialer
-	}
-
-	def interface {
-		proxy.Dialer
-		proxy.ContextDialer
-	}
-}
-
-var _ proxy.ContextDialer = &Dialer{} // *Dialer implements x/net/proxy.ContextDialer
-var _ proxy.Dialer = &Dialer{}        // *Dialer implements x/net/proxy.Dialer
-
-// New creates a new Dialer from a Config.
-//
-// You can also &out.Dialer{} and then call Load on it.
-func New(c Config) (d *Dialer) {
-	d = &Dialer{}
-	d.Load(c)
-	return
-}
-
-// Load loads/reloads the Dialer struct.
-func (d *Dialer) Load(c Config) {
-	d.lock.Lock()
-	defer d.lock.Unlock()
-
-	if len(c.Default) == 0 {
-		c.Default = "direct"
-	}
-	log.Print("default dialer ", c.Default)
-
-	if d.hostnames == nil {
-		d.hostnames = make(map[string]string)
-		d.uris = make(map[string]interface {
-			proxy.Dialer
-			proxy.ContextDialer
-		})
-	} else {
-		clear(d.hostnames)
-		clear(d.uris)
-	}
-
-	for uri, hosts := range c.Proxied {
-		d.uris[uri] = nil
-		for _, host := range hosts {
-			d.hostnames[host] = uri
-			log.Printf("dialer( %s ) => %s", host, uri)
-		}
-	}
-	d.uris[c.Default] = nil
-
-	// construct the Dialers
-	for uri := range d.uris {
-		if uri == "direct" {
-			d.uris[uri] = proxy.Direct
-		} else {
-			url, err := url.Parse(uri)
-			if err != nil {
-				log.Print("URI parse error: ", err)
-				d.uris[uri] = proxy.Direct
-				continue
-			}
-			dx, err := proxy.FromURL(url, proxy.Direct)
-			if err != nil {
-				log.Print("Proxy.FromURL error: ", err)
-				d.uris[uri] = proxy.Direct
-				continue
-			}
-
-			var ok bool
-			if d.uris[uri], ok = dx.(interface {
-				proxy.ContextDialer
-				proxy.Dialer
-			}); !ok {
-				log.Print("Proxy.FromURL unable to cast to proxy.Dialer+ContextDialer")
-				d.uris[uri] = proxy.Direct
-				continue
-			}
-		}
-	}
-
-	d.def = d.uris[c.Default]
-}
-
-func (d *Dialer) findDialer(host string) interface {
-	proxy.Dialer
-	proxy.ContextDialer
-} {
-	d.lock.RLock()
-	defer d.lock.RUnlock()
-
-	if dx, ok := d.uris[d.hostnames[host]]; ok {
-		return dx
-	} else {
-		return d.def
-	}
-}
-
-func (d *Dialer) Dial(network, address string) (net.Conn, error) {
-	host, _ := util.SplitHostPort(address)
-	return d.findDialer(host).Dial(network, address)
-}
-
-func (d *Dialer) DialContext(ctx context.Context, network, address string) (net.Conn, error) {
-	host, _ := util.SplitHostPort(address)
-	return d.findDialer(host).DialContext(ctx, network, address)
-}

internal/perm/perm.go

@@ -69,7 +69,7 @@ func (p *Perm) Load(cs map[string]Config) {
 
 		// loop around the Match map
 		for addrport, act := range c.Match {
-			addr, port := util.SplitHostPort(addrport)
+			addr, port := splitHostPort(addrport)
 			if port != "" {
 				insert(net.JoinHostPort(addr, port), act)
 			} else {
@@ -81,7 +81,7 @@ func (p *Perm) Load(cs map[string]Config) {
 			}
 		}
 		for _, glob := range c.MatchWildcard {
-			addr, port := util.SplitHostPort(glob.Glob)
+			addr, port := splitHostPort(glob.Glob)
 			if port != "" {
 				log.Printf("loading glob target %s, action %s", glob.Glob, glob.Act)
 				p_int.match_glob = append(

internal/util/hostport.go

@@ -1,38 +0,0 @@
-package util
-
-import "strings"
-
-// ValidOptionalPort reports whether port is either an empty string
-// or matches /^:\d*$/
-func ValidOptionalPort(port string) bool {
-	if port == "" {
-		return true
-	}
-	if port[0] != ':' {
-		return false
-	}
-	for _, b := range port[1:] {
-		if b < '0' || b > '9' {
-			return false
-		}
-	}
-	return true
-}
-
-// SplitHostPort separates host and port. If the port is not valid, it returns
-// the entire input as host, and it doesn't check the validity of the host.
-// Unlike net.SplitHostPort, but per RFC 3986, it requires ports to be numeric.
-func SplitHostPort(hostPort string) (host, port string) {
-	host = hostPort
-
-	colon := strings.LastIndexByte(host, ':')
-	if colon != -1 && ValidOptionalPort(host[colon:]) {
-		host, port = host[:colon], host[colon+1:]
-	}
-
-	if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
-		host = host[1 : len(host)-1]
-	}
-
-	return
-}

main.go

@@ -13,25 +13,9 @@ import (
 
 	"edgaru089.ink/go/regolith/internal/conf"
 	"edgaru089.ink/go/regolith/internal/http"
-	"edgaru089.ink/go/regolith/internal/out"
 	"edgaru089.ink/go/regolith/internal/perm"
 )
 
-func readDialer() *out.Dialer {
-	out_buf, err := os.ReadFile("out.json")
-	if err != nil {
-		log.Print("error reading out.json: ", err)
-		return nil
-	}
-	var outcfg out.Config
-	err = json.Unmarshal(out_buf, &outcfg)
-	if err != nil {
-		log.Print("error unmarshaling out.json: ", err)
-		return nil
-	}
-	return out.New(outcfg)
-}
-
 func main() {
 	var s *http.Server
 
@@ -50,9 +34,6 @@ func main() {
 		}
 	}
 
-	dialer := readDialer()
-	s.SetDialer(dialer)
-
 	var conf conf.Config
 	{
 		conf_buf, err := os.ReadFile("config.json")
@@ -94,7 +75,7 @@ func main() {
 	go func() {
 		for {
 			<-sighup_chan
-			log.Printf("SIGHUP received, reloading")
+			log.Printf("SIGHUP received, reloading permissions")
 			perm_buf, err := os.ReadFile("perm.json")
 			if err != nil {
 				log.Printf("skipping reload: error opening perm.json: %e", err)
@@ -107,9 +88,6 @@ func main() {
 				continue
 			}
 			s.Perm.Load(perm_json)
-
-			dialer := readDialer()
-			s.SetDialer(dialer)
 		}
 	}()
 

out.json

@@ -1,10 +0,0 @@
-{
-	"Default": "direct",
-	"Proxied": {
-		"socks5://192.168.1.3:1080": [
-			"github.com",
-			"go.dev",
-			"pkg.go.dev"
-		]
-	}
-}

perm.json

@@ -13,10 +13,9 @@
 		]
 	},
 	"127.0.0.1": {
-		"DefaultAction": "accept",
+		"DefaultAction": "deny",
 		"DefaultPort": [443],
 		"Match": {
-			"github.com": "accept",
 			"pkg.go.dev": "accept",
 			"go.dev": "accept"
 		},