rebrand: frp -> kanhole (kanhole server, kanholec client)
golangci-lint / lint (push) Failing after 1m5s
golangci-lint / lint (push) Failing after 1m5s
This commit is contained in:
+2
-2
@@ -18,8 +18,8 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/msg"
|
||||
)
|
||||
|
||||
type Setter interface {
|
||||
|
||||
+3
-3
@@ -29,9 +29,9 @@ import (
|
||||
"golang.org/x/oauth2"
|
||||
"golang.org/x/oauth2/clientcredentials"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/config/v1/validation"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/config/v1/validation"
|
||||
"kanhole/pkg/msg"
|
||||
)
|
||||
|
||||
// createOIDCHTTPClient creates an HTTP client with custom TLS and proxy configuration for OIDC token requests
|
||||
|
||||
@@ -12,9 +12,9 @@ import (
|
||||
"github.com/coreos/go-oidc/v3/oidc"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/fatedier/frp/pkg/auth"
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"kanhole/pkg/auth"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/msg"
|
||||
)
|
||||
|
||||
type mockTokenVerifier struct{}
|
||||
|
||||
+1
-1
@@ -15,7 +15,7 @@
|
||||
package auth
|
||||
|
||||
import (
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"kanhole/pkg/msg"
|
||||
)
|
||||
|
||||
var AlwaysPassVerifier = &alwaysPass{}
|
||||
|
||||
+3
-3
@@ -19,9 +19,9 @@ import (
|
||||
"slices"
|
||||
"time"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/msg"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type TokenAuthSetterVerifier struct {
|
||||
|
||||
+6
-6
@@ -22,9 +22,9 @@ import (
|
||||
"github.com/spf13/cobra"
|
||||
"github.com/spf13/pflag"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/types"
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/config/v1/validation"
|
||||
"kanhole/pkg/config/types"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/config/v1/validation"
|
||||
)
|
||||
|
||||
// WordSepNormalizeFunc changes all flags that contain "_" separators
|
||||
@@ -154,8 +154,8 @@ func RegisterClientCommonConfigFlags(cmd *cobra.Command, c *v1.ClientCommonConfi
|
||||
}
|
||||
|
||||
if !options.sshMode {
|
||||
cmd.PersistentFlags().StringVarP(&c.ServerAddr, "server_addr", "s", "127.0.0.1", "frp server's address")
|
||||
cmd.PersistentFlags().IntVarP(&c.ServerPort, "server_port", "P", 7000, "frp server's port")
|
||||
cmd.PersistentFlags().StringVarP(&c.ServerAddr, "server_addr", "s", "127.0.0.1", "kanhole server's address")
|
||||
cmd.PersistentFlags().IntVarP(&c.ServerPort, "server_port", "P", 7000, "kanhole server's port")
|
||||
cmd.PersistentFlags().StringVarP(&c.Transport.Protocol, "protocol", "p", "tcp",
|
||||
fmt.Sprintf("optional values are %v", validation.SupportedTransportProtocols))
|
||||
cmd.PersistentFlags().StringVarP(&c.Log.Level, "log_level", "", "info", "log level")
|
||||
@@ -248,7 +248,7 @@ func RegisterServerConfigFlags(cmd *cobra.Command, c *v1.ServerConfig, opts ...R
|
||||
cmd.PersistentFlags().StringVarP(&c.SubDomainHost, "subdomain_host", "", "", "subdomain host")
|
||||
cmd.PersistentFlags().VarP(&PortsRangeSliceFlag{V: &c.AllowPorts}, "allow_ports", "", "allow ports")
|
||||
cmd.PersistentFlags().Int64VarP(&c.MaxPortsPerClient, "max_ports_per_client", "", 0, "max ports per client")
|
||||
cmd.PersistentFlags().BoolVarP(&c.Transport.TLS.Force, "tls_only", "", false, "frps tls only")
|
||||
cmd.PersistentFlags().BoolVarP(&c.Transport.TLS.Force, "tls_only", "", false, "kanhole tls only")
|
||||
|
||||
webServerTLS := v1.TLSConfig{}
|
||||
cmd.PersistentFlags().StringVarP(&webServerTLS.CertFile, "dashboard_tls_cert_file", "", "", "dashboard tls cert file")
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
|
||||
"gopkg.in/ini.v1"
|
||||
|
||||
legacyauth "github.com/fatedier/frp/pkg/auth/legacy"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
legacyauth "kanhole/pkg/auth/legacy"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
// ClientCommonConf is the configuration parsed from ini.
|
||||
|
||||
@@ -19,8 +19,8 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/types"
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"kanhole/pkg/config/types"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func Convert_ClientCommonConf_To_v1(conf *ClientCommonConf) *v1.ClientCommonConfig {
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
|
||||
"gopkg.in/ini.v1"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/types"
|
||||
"kanhole/pkg/config/types"
|
||||
)
|
||||
|
||||
type ProxyType string
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
|
||||
"gopkg.in/ini.v1"
|
||||
|
||||
legacyauth "github.com/fatedier/frp/pkg/auth/legacy"
|
||||
legacyauth "kanhole/pkg/auth/legacy"
|
||||
)
|
||||
|
||||
type HTTPPluginOptions struct {
|
||||
@@ -131,7 +131,7 @@ type ServerCommonConf struct {
|
||||
|
||||
// SubDomainHost specifies the domain that will be attached to sub-domains
|
||||
// requested by the client when using Vhost proxying. For example, if this
|
||||
// value is set to "frps.com" and the client requested the subdomain
|
||||
// value is set to "kanhole.com" and the client requested the subdomain
|
||||
// "test", the resulting URL would be "test.frps.com". By default, this
|
||||
// value is "".
|
||||
SubDomainHost string `ini:"subdomain_host" json:"subdomain_host"`
|
||||
|
||||
@@ -46,7 +46,7 @@ func GetValues() *Values {
|
||||
}
|
||||
|
||||
func RenderContent(in []byte) (out []byte, err error) {
|
||||
tmpl, errRet := template.New("frp").Parse(string(in))
|
||||
tmpl, errRet := template.New("kanhole").Parse(string(in))
|
||||
if errRet != nil {
|
||||
err = errRet
|
||||
return
|
||||
|
||||
+7
-7
@@ -30,12 +30,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
"k8s.io/apimachinery/pkg/util/yaml"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/legacy"
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/config/v1/validation"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/config/legacy"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/config/v1/validation"
|
||||
"kanhole/pkg/msg"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
var glbEnvs map[string]string
|
||||
@@ -82,7 +82,7 @@ func DetectLegacyINIFormatFromFile(path string) bool {
|
||||
}
|
||||
|
||||
func RenderWithTemplate(in []byte, values *Values) ([]byte, error) {
|
||||
tmpl, err := template.New("frp").Funcs(template.FuncMap{
|
||||
tmpl, err := template.New("kanhole").Funcs(template.FuncMap{
|
||||
"parseNumberRange": parseNumberRange,
|
||||
"parseNumberRangePair": parseNumberRangePair,
|
||||
}).Parse(string(in))
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
const tomlServerContent = `
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
"slices"
|
||||
"sync"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
type Aggregator struct {
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
// mockProxy creates a TCP proxy config for testing
|
||||
|
||||
@@ -17,7 +17,7 @@ package source
|
||||
import (
|
||||
"sync"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
// baseSource provides shared state and behavior for Source implementations.
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func TestBaseSourceLoadReturnsClonedConfigurers(t *testing.T) {
|
||||
|
||||
@@ -17,7 +17,7 @@ package source
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func cloneConfigurers(
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
package source
|
||||
|
||||
import v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
import v1 "kanhole/pkg/config/v1"
|
||||
|
||||
// ConfigSource implements Source for in-memory configuration.
|
||||
// All operations are thread-safe.
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func TestNewConfigSource(t *testing.T) {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
package source
|
||||
|
||||
import (
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
// Source is the interface for configuration sources.
|
||||
|
||||
@@ -20,8 +20,8 @@ import (
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
)
|
||||
|
||||
type StoreSourceConfig struct {
|
||||
|
||||
@@ -22,8 +22,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
)
|
||||
|
||||
func TestStoreSource_AddProxyAndVisitor_DoesNotApplyRuntimeDefaults(t *testing.T) {
|
||||
|
||||
@@ -17,7 +17,7 @@ package source
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func validateProxyName(proxy v1.ProxyConfigurer) (string, error) {
|
||||
|
||||
@@ -17,7 +17,7 @@ package config
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type NumberPair struct {
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type ClientConfig struct {
|
||||
|
||||
@@ -17,7 +17,7 @@ package v1
|
||||
import (
|
||||
"maps"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type AuthScope string
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
"fmt"
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
)
|
||||
|
||||
type DecodeOptions struct {
|
||||
|
||||
@@ -19,10 +19,10 @@ import (
|
||||
"reflect"
|
||||
"slices"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/types"
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/config/types"
|
||||
"kanhole/pkg/msg"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type ProxyTransport struct {
|
||||
|
||||
@@ -19,8 +19,8 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -17,8 +17,8 @@ package v1
|
||||
import (
|
||||
"github.com/samber/lo"
|
||||
|
||||
"github.com/fatedier/frp/pkg/config/types"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/config/types"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type ServerConfig struct {
|
||||
@@ -60,7 +60,7 @@ type ServerConfig struct {
|
||||
TCPMuxPassthrough bool `json:"tcpmuxPassthrough,omitempty"`
|
||||
// SubDomainHost specifies the domain that will be attached to sub-domains
|
||||
// requested by the client when using Vhost proxying. For example, if this
|
||||
// value is set to "frps.com" and the client requested the subdomain
|
||||
// value is set to "kanhole.com" and the client requested the subdomain
|
||||
// "test", the resulting URL would be "test.frps.com".
|
||||
SubDomainHost string `json:"subDomainHost,omitempty"`
|
||||
// Custom404Page specifies a path to a custom 404 page to display. If this
|
||||
|
||||
@@ -17,8 +17,8 @@ package validation
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/policy/security"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/policy/security"
|
||||
)
|
||||
|
||||
func (v *ConfigValidator) validateAuthTokenSource(token string, tokenSource *v1.ValueSource) error {
|
||||
|
||||
@@ -19,8 +19,8 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/policy/security"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/policy/security"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -22,9 +22,9 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/policy/featuregate"
|
||||
"github.com/fatedier/frp/pkg/policy/security"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/policy/featuregate"
|
||||
"kanhole/pkg/policy/security"
|
||||
)
|
||||
|
||||
func (v *ConfigValidator) ValidateClientCommonConfig(c *v1.ClientCommonConfig) (Warning, error) {
|
||||
|
||||
@@ -18,7 +18,7 @@ import (
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func validateWebServerConfig(c *v1.WebServerConfig) error {
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
"net/url"
|
||||
"strings"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func ValidateOIDCClientCredentialsConfig(c *v1.AuthOIDCClientConfig) error {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func TestValidateOIDCClientCredentialsConfig(t *testing.T) {
|
||||
|
||||
@@ -17,7 +17,7 @@ package validation
|
||||
import (
|
||||
"errors"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func ValidateClientPluginOptions(c v1.ClientPluginOptions) error {
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/util/validation"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func validateProxyBaseConfigForClient(c *v1.ProxyBaseConfig) error {
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func (v *ConfigValidator) ValidateServerConfig(c *v1.ServerConfig) (Warning, error) {
|
||||
|
||||
@@ -17,8 +17,8 @@ package validation
|
||||
import (
|
||||
"errors"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
splugin "github.com/fatedier/frp/pkg/plugin/server"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
splugin "kanhole/pkg/plugin/server"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -3,7 +3,7 @@ package validation
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/fatedier/frp/pkg/policy/security"
|
||||
"kanhole/pkg/policy/security"
|
||||
)
|
||||
|
||||
// ConfigValidator holds the context dependencies for configuration validation.
|
||||
|
||||
@@ -19,7 +19,7 @@ import (
|
||||
"fmt"
|
||||
"slices"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func ValidateVisitorConfigurer(c v1.VisitorConfigurer) error {
|
||||
|
||||
@@ -17,8 +17,8 @@ package v1
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
type VisitorTransport struct {
|
||||
|
||||
@@ -17,7 +17,7 @@ package v1
|
||||
import (
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/jsonx"
|
||||
"kanhole/pkg/util/jsonx"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+2
-2
@@ -5,8 +5,8 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
const configKey = "server_config"
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@ import (
|
||||
entsql "entgo.io/ent/dialect/sql"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db/ent"
|
||||
"kanhole/pkg/db/ent"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -9,15 +9,15 @@ import (
|
||||
"log"
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db/ent/migrate"
|
||||
"kanhole/pkg/db/ent/migrate"
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// Client is the client that holds all ent builders.
|
||||
|
||||
+4
-4
@@ -12,10 +12,10 @@ import (
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// ent aliases to avoid import conflicts in user's code.
|
||||
|
||||
@@ -5,12 +5,12 @@ package enttest
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db/ent"
|
||||
"kanhole/pkg/db/ent"
|
||||
// required by schema hooks.
|
||||
_ "github.com/fatedier/frp/pkg/db/ent/runtime"
|
||||
_ "kanhole/pkg/db/ent/runtime"
|
||||
|
||||
"entgo.io/ent/dialect/sql/schema"
|
||||
"github.com/fatedier/frp/pkg/db/ent/migrate"
|
||||
"kanhole/pkg/db/ent/migrate"
|
||||
)
|
||||
|
||||
type (
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
)
|
||||
|
||||
// FrpcClient is the model entity for the FrpcClient schema.
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
)
|
||||
|
||||
// FrpcClientCreate is the builder for creating a FrpcClient entity.
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// FrpcClientDelete is the builder for deleting a FrpcClient entity.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// FrpcClientQuery is the builder for querying FrpcClient entities.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// FrpcClientUpdate is the builder for updating FrpcClient entities.
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"context"
|
||||
"fmt"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db/ent"
|
||||
"kanhole/pkg/db/ent"
|
||||
)
|
||||
|
||||
// The FrpcClientFunc type is an adapter to allow the use of ordinary
|
||||
|
||||
@@ -11,11 +11,11 @@ import (
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
)
|
||||
|
||||
// Proxy is the model entity for the Proxy schema.
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
)
|
||||
|
||||
// ProxyCreate is the builder for creating a Proxy entity.
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
)
|
||||
|
||||
// ProxyDelete is the builder for deleting a Proxy entity.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
)
|
||||
|
||||
// ProxyQuery is the builder for querying Proxy entities.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
)
|
||||
|
||||
// ProxyUpdate is the builder for updating Proxy entities.
|
||||
|
||||
@@ -5,10 +5,10 @@ package ent
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/fatedier/frp/pkg/db/ent/frpcclient"
|
||||
"github.com/fatedier/frp/pkg/db/ent/proxy"
|
||||
"github.com/fatedier/frp/pkg/db/ent/schema"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/frpcclient"
|
||||
"kanhole/pkg/db/ent/proxy"
|
||||
"kanhole/pkg/db/ent/schema"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// The init function reads all schema descriptors with runtime code
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
package runtime
|
||||
|
||||
// The schema-stitching logic is generated in github.com/fatedier/frp/pkg/db/ent/runtime.go
|
||||
// The schema-stitching logic is generated in kanhole/pkg/db/ent/runtime.go
|
||||
|
||||
const (
|
||||
Version = "v0.14.6" // Version of ent codegen.
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
// ServerConfig is the model entity for the ServerConfig schema.
|
||||
|
||||
@@ -4,7 +4,7 @@ package serverconfig
|
||||
|
||||
import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
||||
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
// ServerConfigCreate is the builder for creating a ServerConfig entity.
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
// ServerConfigDelete is the builder for deleting a ServerConfig entity.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
// ServerConfigQuery is the builder for querying ServerConfig entities.
|
||||
|
||||
@@ -10,8 +10,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/serverconfig"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/serverconfig"
|
||||
)
|
||||
|
||||
// ServerConfigUpdate is the builder for updating ServerConfig entities.
|
||||
|
||||
+1
-1
@@ -9,7 +9,7 @@ import (
|
||||
|
||||
"entgo.io/ent"
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// User is the model entity for the User schema.
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"time"
|
||||
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
)
|
||||
|
||||
// ID filters vertices based on their ID field.
|
||||
|
||||
@@ -10,7 +10,7 @@ import (
|
||||
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// UserCreate is the builder for creating a User entity.
|
||||
|
||||
@@ -8,8 +8,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// UserDelete is the builder for deleting a User entity.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// UserQuery is the builder for querying User entities.
|
||||
|
||||
@@ -11,8 +11,8 @@ import (
|
||||
"entgo.io/ent/dialect/sql"
|
||||
"entgo.io/ent/dialect/sql/sqlgraph"
|
||||
"entgo.io/ent/schema/field"
|
||||
"github.com/fatedier/frp/pkg/db/ent/predicate"
|
||||
"github.com/fatedier/frp/pkg/db/ent/user"
|
||||
"kanhole/pkg/db/ent/predicate"
|
||||
"kanhole/pkg/db/ent/user"
|
||||
)
|
||||
|
||||
// UserUpdate is the builder for updating User entities.
|
||||
|
||||
@@ -15,9 +15,9 @@
|
||||
package aggregate
|
||||
|
||||
import (
|
||||
"github.com/fatedier/frp/pkg/metrics/mem"
|
||||
"github.com/fatedier/frp/pkg/metrics/prometheus"
|
||||
"github.com/fatedier/frp/server/metrics"
|
||||
"kanhole/pkg/metrics/mem"
|
||||
"kanhole/pkg/metrics/prometheus"
|
||||
"kanhole/server/metrics"
|
||||
)
|
||||
|
||||
// EnableMem start to mark metrics to memory monitor system.
|
||||
|
||||
@@ -20,9 +20,9 @@ import (
|
||||
|
||||
"k8s.io/utils/clock"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/log"
|
||||
"github.com/fatedier/frp/pkg/util/metric"
|
||||
server "github.com/fatedier/frp/server/metrics"
|
||||
"kanhole/pkg/util/log"
|
||||
"kanhole/pkg/util/metric"
|
||||
server "kanhole/server/metrics"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -17,7 +17,7 @@ package mem
|
||||
import (
|
||||
"time"
|
||||
|
||||
"github.com/fatedier/frp/pkg/util/metric"
|
||||
"kanhole/pkg/util/metric"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
package metrics
|
||||
|
||||
import (
|
||||
"github.com/fatedier/frp/pkg/metrics/aggregate"
|
||||
"kanhole/pkg/metrics/aggregate"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -3,11 +3,11 @@ package prometheus
|
||||
import (
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
|
||||
"github.com/fatedier/frp/server/metrics"
|
||||
"kanhole/server/metrics"
|
||||
)
|
||||
|
||||
const (
|
||||
namespace = "frp"
|
||||
namespace = "kanhole"
|
||||
serverSubsystem = "server"
|
||||
)
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/fatedier/frp/pkg/proto/wire"
|
||||
"kanhole/pkg/proto/wire"
|
||||
)
|
||||
|
||||
func TestConnReadWriteMsg(t *testing.T) {
|
||||
|
||||
+1
-1
@@ -20,7 +20,7 @@ import (
|
||||
"net"
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/proto/wire"
|
||||
"kanhole/pkg/proto/wire"
|
||||
)
|
||||
|
||||
type ReadWriter interface {
|
||||
|
||||
+1
-1
@@ -21,7 +21,7 @@ import (
|
||||
"io"
|
||||
"reflect"
|
||||
|
||||
"github.com/fatedier/frp/pkg/proto/wire"
|
||||
"kanhole/pkg/proto/wire"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
"github.com/fatedier/frp/pkg/proto/wire"
|
||||
"kanhole/pkg/proto/wire"
|
||||
)
|
||||
|
||||
func TestV2ReadWriterRoundTrip(t *testing.T) {
|
||||
|
||||
@@ -29,10 +29,10 @@ import (
|
||||
"github.com/samber/lo"
|
||||
"golang.org/x/sync/errgroup"
|
||||
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"github.com/fatedier/frp/pkg/transport"
|
||||
"github.com/fatedier/frp/pkg/util/log"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
"kanhole/pkg/msg"
|
||||
"kanhole/pkg/transport"
|
||||
"kanhole/pkg/util/log"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
// NatHoleTimeout seconds.
|
||||
|
||||
@@ -28,9 +28,9 @@ import (
|
||||
"golang.org/x/net/ipv4"
|
||||
"k8s.io/apimachinery/pkg/util/sets"
|
||||
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"github.com/fatedier/frp/pkg/transport"
|
||||
"github.com/fatedier/frp/pkg/util/xlog"
|
||||
"kanhole/pkg/msg"
|
||||
"kanhole/pkg/transport"
|
||||
"kanhole/pkg/util/xlog"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
"github.com/fatedier/golib/crypto"
|
||||
"github.com/pion/stun/v3"
|
||||
|
||||
"github.com/fatedier/frp/pkg/msg"
|
||||
"kanhole/pkg/msg"
|
||||
)
|
||||
|
||||
func EncodeMessage(m msg.Message, key []byte) ([]byte, error) {
|
||||
|
||||
@@ -19,7 +19,7 @@ package client
|
||||
import (
|
||||
"net/http/httputil"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"net/http"
|
||||
"net/http/httputil"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -25,10 +25,10 @@ import (
|
||||
|
||||
"github.com/fatedier/golib/pool"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/plugin/client/internal/httpsserver"
|
||||
"github.com/fatedier/frp/pkg/util/log"
|
||||
netpkg "github.com/fatedier/frp/pkg/util/net"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/plugin/client/internal/httpsserver"
|
||||
"kanhole/pkg/util/log"
|
||||
netpkg "kanhole/pkg/util/net"
|
||||
)
|
||||
|
||||
const httpBridgeReadHeaderTimeout = 60 * time.Second
|
||||
|
||||
@@ -29,9 +29,9 @@ import (
|
||||
libio "github.com/fatedier/golib/io"
|
||||
libnet "github.com/fatedier/golib/net"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
netpkg "github.com/fatedier/frp/pkg/util/net"
|
||||
"github.com/fatedier/frp/pkg/util/util"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
netpkg "kanhole/pkg/util/net"
|
||||
"kanhole/pkg/util/util"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -27,7 +27,7 @@ import (
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func TestHTTPProxyHandleFragmentedConnectMethod(t *testing.T) {
|
||||
|
||||
@@ -19,7 +19,7 @@ package client
|
||||
import (
|
||||
"net/http/httputil"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
"net/http"
|
||||
"net/http/httputil"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
@@ -24,8 +24,8 @@ import (
|
||||
|
||||
"github.com/samber/lo"
|
||||
|
||||
"github.com/fatedier/frp/pkg/transport"
|
||||
httppkg "github.com/fatedier/frp/pkg/util/http"
|
||||
"kanhole/pkg/transport"
|
||||
httppkg "kanhole/pkg/util/http"
|
||||
)
|
||||
|
||||
func New(handler http.Handler, crtPath, keyPath string, enableHTTP2 *bool) (*http.Server, error) {
|
||||
|
||||
@@ -24,8 +24,8 @@ import (
|
||||
"github.com/fatedier/golib/errors"
|
||||
pp "github.com/pires/go-proxyproto"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
"github.com/fatedier/frp/pkg/vnet"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
"kanhole/pkg/vnet"
|
||||
)
|
||||
|
||||
type PluginContext struct {
|
||||
|
||||
@@ -23,8 +23,8 @@ import (
|
||||
|
||||
gosocks5 "github.com/armon/go-socks5"
|
||||
|
||||
v1 "github.com/fatedier/frp/pkg/config/v1"
|
||||
netpkg "github.com/fatedier/frp/pkg/util/net"
|
||||
v1 "kanhole/pkg/config/v1"
|
||||
netpkg "kanhole/pkg/util/net"
|
||||
)
|
||||
|
||||
func init() {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user