ChenKaiLiuG/GoEdgeNode
Archived
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

v1.4.1

Browse Source
This commit is contained in:
GoEdgeLab
2024-07-27 15:42:50 +08:00
parent d511145bc5
commit c19be78e0d
524 changed files with 1817 additions and 1346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/iplibrary/action_base.go
+2 -1
View File
@@ -2,8 +2,9 @@ package iplibrary
import (
"encoding/json"
"github.com/iwind/TeaGo/maps"
"net/http"
"github.com/iwind/TeaGo/maps"
)
type BaseAction struct {
internal/iplibrary/action_firewalld.go
+3 -2
View File
@@ -3,11 +3,12 @@ package iplibrary
import (
"errors"
"fmt"
"runtime"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"runtime"
"time"
)
// FirewalldAction Firewalld动作管理
internal/iplibrary/action_firewalld_test.go
+3 -2
View File
@@ -1,10 +1,11 @@
package iplibrary
import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
)
func TestFirewalldAction_AddItem(t *testing.T) {
internal/iplibrary/action_html.go
+2 -1
View File
@@ -1,9 +1,10 @@
package iplibrary
import (
"net/http"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"net/http"
)
// HTMLAction HTML动作
internal/iplibrary/action_http_api.go
+3 -2
View File
@@ -3,12 +3,13 @@ package iplibrary
import (
"bytes"
"encoding/json"
"net/http"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
teaconst "github.com/TeaOSLab/EdgeNode/internal/const"
"github.com/iwind/TeaGo/maps"
"net/http"
"time"
)
var httpAPIClient = &http.Client{
internal/iplibrary/action_http_api_test.go
+2 -1
View File
@@ -1,10 +1,11 @@
package iplibrary
import (
"testing"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"testing"
)
func TestHTTPAPIAction_AddItem(t *testing.T) {
internal/iplibrary/action_interface.go
+2 -1
View File
@@ -1,9 +1,10 @@
package iplibrary
import (
"net/http"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"net/http"
)
type ActionInterface interface {
internal/iplibrary/action_ipset.go
+5 -4
View File
@@ -3,14 +3,15 @@ package iplibrary
import (
"errors"
"fmt"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"github.com/iwind/TeaGo/types"
"runtime"
"strconv"
"strings"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"github.com/iwind/TeaGo/types"
)
// IPSetAction IPSet动作
internal/iplibrary/action_ipset_test.go
+3 -2
View File
@@ -1,13 +1,14 @@
package iplibrary_test
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"github.com/iwind/TeaGo/maps"
"testing"
"time"
)
func TestIPSetAction_Init(t *testing.T) {
internal/iplibrary/action_iptables.go
+4 -3
View File
@@ -2,13 +2,14 @@ package iplibrary
import (
"fmt"
"runtime"
"strings"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/utils"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"runtime"
"strings"
"time"
)
// IPTablesAction IPTables动作
internal/iplibrary/action_iptables_test.go
+3 -2
View File
@@ -1,11 +1,12 @@
package iplibrary
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"testing"
"time"
)
func TestIPTablesAction_AddItem(t *testing.T) {
internal/iplibrary/action_manager.go
+3 -2
View File
@@ -5,11 +5,12 @@ import (
"encoding/json"
"errors"
"fmt"
"strconv"
"sync"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
"strconv"
"sync"
)
var SharedActionManager = NewActionManager()
internal/iplibrary/action_manager_test.go
+2 -1
View File
@@ -1,9 +1,10 @@
package iplibrary
import (
"testing"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/iwind/TeaGo/maps"
"testing"
)
func TestActionManager_UpdateActions(t *testing.T) {
internal/iplibrary/action_script.go
+3 -2
View File
@@ -2,11 +2,12 @@ package iplibrary
import (
"fmt"
"path/filepath"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
executils "github.com/TeaOSLab/EdgeNode/internal/utils/exec"
"path/filepath"
"time"
)
// ScriptAction 脚本命令动作
internal/iplibrary/action_script_test.go
+3 -2
View File
@@ -1,11 +1,12 @@
package iplibrary
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"testing"
"time"
)
func TestScriptAction_AddItem(t *testing.T) {
internal/iplibrary/ip_item_test.go
+5 -4
View File
@@ -1,15 +1,16 @@
package iplibrary_test
import (
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/iwind/TeaGo/assert"
"math/rand"
"runtime"
"strconv"
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/iwind/TeaGo/assert"
)
func TestIPItem_Contains(t *testing.T) {
internal/iplibrary/ip_list.go
+3 -2
View File
@@ -1,11 +1,12 @@
package iplibrary
import (
"sort"
"sync"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/utils/expires"
"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
"sort"
"sync"
)
var GlobalBlackIPList = NewIPList()
internal/iplibrary/ip_list_db.go
+1 -1
View File
@@ -1,4 +1,4 @@
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
package iplibrary
internal/iplibrary/ip_list_kv.go
+4 -3
View File
@@ -1,10 +1,13 @@
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
package iplibrary
import (
"encoding/binary"
"errors"
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeNode/internal/events"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
@@ -12,8 +15,6 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/utils/goman"
"github.com/TeaOSLab/EdgeNode/internal/utils/idles"
"github.com/TeaOSLab/EdgeNode/internal/utils/kvstore"
"testing"
"time"
)
type KVIPList struct {
internal/iplibrary/ip_list_kv_objects.go
+3 -2
View File
@@ -1,13 +1,14 @@
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
package iplibrary
import (
"encoding/binary"
"errors"
"math"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"google.golang.org/protobuf/proto"
"math"
)
type IPItemEncoder[T interface{ *pb.IPItem }] struct {
internal/iplibrary/ip_list_kv_test.go
+4 -3
View File
@@ -1,15 +1,16 @@
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
// Copyright 2024 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .
package iplibrary_test
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/TeaOSLab/EdgeNode/internal/utils/zero"
"testing"
"time"
)
func TestKVIPList_AddItem(t *testing.T) {
internal/iplibrary/ip_list_sqlite.go
+4 -3
View File
@@ -3,6 +3,10 @@
package iplibrary
import (
"os"
"path/filepath"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeNode/internal/events"
"github.com/TeaOSLab/EdgeNode/internal/remotelogs"
@@ -10,9 +14,6 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/utils/goman"
"github.com/TeaOSLab/EdgeNode/internal/utils/idles"
"github.com/iwind/TeaGo/Tea"
"os"
"path/filepath"
"time"
)
type SQLiteIPList struct {
internal/iplibrary/ip_list_sqlite_test.go
+3 -2
View File
@@ -3,12 +3,13 @@
package iplibrary_test
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
_ "github.com/iwind/TeaGo/bootstrap"
"github.com/iwind/TeaGo/logs"
"testing"
"time"
)
func TestSQLiteIPList_AddItem(t *testing.T) {
internal/iplibrary/ip_list_test.go
+8 -7
View File
@@ -2,13 +2,6 @@ package iplibrary_test
import (
"fmt"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/iwind/TeaGo/assert"
"github.com/iwind/TeaGo/logs"
"github.com/iwind/TeaGo/rands"
"math/rand"
"runtime"
"runtime/debug"
@@ -16,6 +9,14 @@ import (
"sync"
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/fasttime"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/iwind/TeaGo/assert"
"github.com/iwind/TeaGo/logs"
"github.com/iwind/TeaGo/rands"
)
func TestIPList_Add_Empty(t *testing.T) {
internal/iplibrary/list_utils.go
+1
View File
@@ -4,6 +4,7 @@ package iplibrary
import (
"encoding/hex"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/iwind/TeaGo/Tea"
internal/iplibrary/list_utils_test.go
+2 -1
View File
@@ -3,9 +3,10 @@
package iplibrary
import (
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"testing"
"time"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
)
func TestIPIsAllowed(t *testing.T) {
internal/iplibrary/manager_ip_list.go
+4 -3
View File
@@ -1,6 +1,10 @@
package iplibrary
import (
"os"
"sync"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -15,9 +19,6 @@ import (
"github.com/TeaOSLab/EdgeNode/internal/waf"
"github.com/iwind/TeaGo/Tea"
"github.com/iwind/TeaGo/types"
"os"
"sync"
"time"
)
var SharedIPListManager = NewIPListManager()
internal/iplibrary/manager_ip_list_test.go
+3 -2
View File
@@ -1,12 +1,13 @@
package iplibrary_test
import (
"testing"
"time"
"github.com/TeaOSLab/EdgeCommon/pkg/iputils"
"github.com/TeaOSLab/EdgeNode/internal/iplibrary"
"github.com/TeaOSLab/EdgeNode/internal/utils/testutils"
"github.com/iwind/TeaGo/logs"
"testing"
"time"
)
func TestIPListManager_init(t *testing.T) {