pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-04-10 11:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Pass the new data down from the websocket

Browse Source
This commit is contained in:
Owen
2026-04-09 16:13:19 -04:00
parent 5848c8d4b4
commit 092535441e
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
clients/clients.go
View File

@@ -40,13 +40,17 @@ type WgConfig struct {
} }
type Target struct { type Target struct {
SourcePrefix string `json:"sourcePrefix"` SourcePrefix string `json:"sourcePrefix"`
SourcePrefixes []string `json:"sourcePrefixes"` SourcePrefixes []string `json:"sourcePrefixes"`
DestPrefix string `json:"destPrefix"` DestPrefix string `json:"destPrefix"`
RewriteTo string `json:"rewriteTo,omitempty"` RewriteTo string `json:"rewriteTo,omitempty"`
DisableIcmp bool `json:"disableIcmp,omitempty"` DisableIcmp bool `json:"disableIcmp,omitempty"`
PortRange []PortRange `json:"portRange,omitempty"` PortRange []PortRange `json:"portRange,omitempty"`
ResourceId int `json:"resourceId,omitempty"` ResourceId int `json:"resourceId,omitempty"`
Protocol string `json:"protocol,omitempty"` // for now practicably either http or https
HTTPTargets []netstack2.HTTPTarget `json:"httpTargets,omitempty"` // for http protocol, list of downstream services to load balance across
TLSCert string `json:"tlsCert,omitempty"` // PEM-encoded certificate for incoming HTTPS termination
TLSKey string `json:"tlsKey,omitempty"` // PEM-encoded private key for incoming HTTPS termination
} }
type PortRange struct { type PortRange struct {
@@ -704,6 +708,10 @@ func (s *WireGuardService) syncTargets(desiredTargets []Target) error {
PortRanges: portRanges, PortRanges: portRanges,
DisableIcmp: target.DisableIcmp, DisableIcmp: target.DisableIcmp,
ResourceId: target.ResourceId, ResourceId: target.ResourceId,
Protocol: target.Protocol,
HTTPTargets: target.HTTPTargets,
TLSCert: target.TLSCert,
TLSKey: target.TLSKey,
}) })
logger.Info("Added target %s -> %s during sync", target.SourcePrefix, target.DestPrefix) logger.Info("Added target %s -> %s during sync", target.SourcePrefix, target.DestPrefix)
} }
@@ -969,6 +977,10 @@ func (s *WireGuardService) ensureTargets(targets []Target) error {
PortRanges: portRanges, PortRanges: portRanges,
DisableIcmp: target.DisableIcmp, DisableIcmp: target.DisableIcmp,
ResourceId: target.ResourceId, ResourceId: target.ResourceId,
Protocol: target.Protocol,
HTTPTargets: target.HTTPTargets,
TLSCert: target.TLSCert,
TLSKey: target.TLSKey,
}) })
logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange) logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange)
} }
@@ -1369,6 +1381,10 @@ func (s *WireGuardService) handleAddTarget(msg websocket.WSMessage) {
PortRanges: portRanges, PortRanges: portRanges,
DisableIcmp: target.DisableIcmp, DisableIcmp: target.DisableIcmp,
ResourceId: target.ResourceId, ResourceId: target.ResourceId,
Protocol: target.Protocol,
HTTPTargets: target.HTTPTargets,
TLSCert: target.TLSCert,
TLSKey: target.TLSKey,
}) })
logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange) logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange)
} }
@@ -1494,6 +1510,10 @@ func (s *WireGuardService) handleUpdateTarget(msg websocket.WSMessage) {
PortRanges: portRanges, PortRanges: portRanges,
DisableIcmp: target.DisableIcmp, DisableIcmp: target.DisableIcmp,
ResourceId: target.ResourceId, ResourceId: target.ResourceId,
Protocol: target.Protocol,
HTTPTargets: target.HTTPTargets,
TLSCert: target.TLSCert,
TLSKey: target.TLSKey,
}) })
logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange) logger.Info("Added target subnet from %s to %s rewrite to %s with port ranges: %v", sp, target.DestPrefix, target.RewriteTo, target.PortRange)
} }

8
netstack2/http_handler.go
View File

@@ -26,9 +26,9 @@ import (
// HTTPTarget describes a single downstream HTTP or HTTPS service that the // HTTPTarget describes a single downstream HTTP or HTTPS service that the
// proxy should forward requests to. // proxy should forward requests to.
type HTTPTarget struct { type HTTPTarget struct {
DestAddr string // IP address or hostname of the downstream service DestAddr string `json:"destAddr"` // IP address or hostname of the downstream service
DestPort uint16 // TCP port of the downstream service DestPort uint16 `json:"destPort"` // TCP port of the downstream service
UseHTTPS bool // When true the outbound leg uses HTTPS UseHTTPS bool `json:"useHttps"` // When true the outbound leg uses HTTPS
} }
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
@@ -315,4 +315,4 @@ func (h *HTTPHandler) handleRequest(w http.ResponseWriter, r *http.Request) {
r.Method, r.URL.RequestURI(), scheme, target.DestAddr, target.DestPort) r.Method, r.URL.RequestURI(), scheme, target.DestAddr, target.DestPort)
h.getProxy(target).ServeHTTP(w, r) h.getProxy(target).ServeHTTP(w, r)
} }