diff --git a/build/install.sh b/build/install.sh new file mode 100644 index 0000000..216fab3 --- /dev/null +++ b/build/install.sh @@ -0,0 +1,72 @@ +#!/bin/bash +set -euo pipefail + +# SafeLine WAF 二进制安装脚本 +# 用法: bash install.sh [安装目录] + +INSTALL_DIR="${1:-/data/safeline}" +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + +RED='\033[0;31m' +GREEN='\033[0;32m' +NC='\033[0m' + +info() { echo -e "${GREEN}[INFO]${NC} $*"; } +error() { echo -e "${RED}[ERROR]${NC} $*"; exit 1; } + +# 检查 root +if [ "$(id -u)" -ne 0 ]; then + error "需要 root 权限" +fi + +# 检查 Docker +if ! command -v docker &>/dev/null; then + error "Docker 未安装" +fi + +info "安装到: $INSTALL_DIR" + +# 创建目录 +mkdir -p "$INSTALL_DIR"/{resources/{mgt,postgres/data,nginx,detector,chaos,cache,sock,luigi},logs/{nginx,detector},bin} + +# 复制二进制 +cp "$SCRIPT_DIR/webserver" "$INSTALL_DIR/bin/" +cp "$SCRIPT_DIR/tcontrollerd" "$INSTALL_DIR/bin/" +chmod +x "$INSTALL_DIR/bin/webserver" "$INSTALL_DIR/bin/tcontrollerd" +info "二进制已复制" + +# 生成配置 +if [ ! -f "$INSTALL_DIR/.env" ]; then + POSTGRES_PASSWORD=$(tr -dc 'a-zA-Z0-9' < /dev/urandom | head -c 20) + cat > "$INSTALL_DIR/.env" << EOF +SAFELINE_DIR=$INSTALL_DIR +POSTGRES_PASSWORD=$POSTGRES_PASSWORD +MGT_PORT=9443 +RELEASE= +CHANNEL= +REGION= +IMAGE_PREFIX=chaitin +IMAGE_TAG=9.3.9 +SUBNET_PREFIX=192.168.90 +ARCH_SUFFIX= +EOF + info ".env 已生成" +fi + +# 复制 compose +if [ -f "$SCRIPT_DIR/compose.yaml" ]; then + cp "$SCRIPT_DIR/compose.yaml" "$INSTALL_DIR/docker-compose.yaml" + info "compose.yaml 已复制" +fi + +# 启动 +cd "$INSTALL_DIR" +if docker compose version &>/dev/null; then + docker compose up -d --remove-orphans +else + docker-compose up -d --remove-orphans +fi + +info "启动完成!" +info "管理面板: https://$(hostname -I | awk '{print $1}'):9443/" +info "获取密码: docker exec safeline-mgt /app/mgt-cli reset-admin --once" diff --git a/build/tcontrollerd b/build/tcontrollerd new file mode 100644 index 0000000..0e9b30f Binary files /dev/null and b/build/tcontrollerd differ diff --git a/build/webserver b/build/webserver new file mode 100644 index 0000000..f333e2b Binary files /dev/null and b/build/webserver differ diff --git a/management/tcontrollerd/go.mod b/management/tcontrollerd/go.mod index aba1d94..aebe337 100644 --- a/management/tcontrollerd/go.mod +++ b/management/tcontrollerd/go.mod @@ -15,6 +15,14 @@ require ( require ( golang.org/x/net v0.33.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect + google.golang.org/protobuf v1.34.1 // indirect +) + +replace ( + chaitin.cn/dev/go/errors => ../webserver/stubs/chaitin.cn/dev/go/errors + chaitin.cn/dev/go/log => ../webserver/stubs/chaitin.cn/dev/go/log + chaitin.cn/dev/go/settings => ../webserver/stubs/chaitin.cn/dev/go/settings ) diff --git a/management/tcontrollerd/go.sum b/management/tcontrollerd/go.sum index fe02fe0..cea606d 100644 --- a/management/tcontrollerd/go.sum +++ b/management/tcontrollerd/go.sum @@ -1,127 +1,30 @@ -chaitin.cn/dev/go/errors v0.0.0-20200717101723-df6132d53dc8/go.mod h1:u+ZD0shdyUt0UG9XfCgD1R5mSqXpTVoO5rwQXQeo3Eo= -chaitin.cn/dev/go/errors v0.0.0-20210324055134-dc5247602af6 h1:1Qa9ABk907/9ZrOLbbRcS8Fqq9VhjAF/mLjbSP1qAJY= -chaitin.cn/dev/go/errors v0.0.0-20210324055134-dc5247602af6/go.mod h1:u+ZD0shdyUt0UG9XfCgD1R5mSqXpTVoO5rwQXQeo3Eo= -chaitin.cn/dev/go/log v0.0.0-20221220104336-05125760b10c h1:Xn9IYkxmnpDcEpV+7JIR5ufEIexd1dhqKwpOLG1mYOE= -chaitin.cn/dev/go/log v0.0.0-20221220104336-05125760b10c/go.mod h1:xJIYwUoA2TX5mNg/RBrEPyE251BPwj+70/mM7UIhoxg= -chaitin.cn/dev/go/settings v0.0.0-20221220104336-05125760b10c h1:tXsraF7o9iUsQY6IwpDJusc6OFhB7iv/bBTfgR3MPUU= -chaitin.cn/dev/go/settings v0.0.0-20221220104336-05125760b10c/go.mod h1:fUvtmpG8Z8Zf5aciadL9a/vn5SB3knG7pdNJixDplPg= -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= -github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= -github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= -github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= -github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= -github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.39.0-dev h1:K4VkkiYp4LCvQiW6OiGglzm5nO4Zyryf7pHhzP15cmI= -google.golang.org/grpc v1.39.0-dev/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 h1:Zy9XzmMEflZ/MAaA7vNcoebnRAld7FsPW1EeBB7V0m8= +google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= -google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= -google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= -google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= -google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/management/tcontrollerd/proto/website/website_stub.go b/management/tcontrollerd/proto/website/website_stub.go new file mode 100644 index 0000000..899b442 --- /dev/null +++ b/management/tcontrollerd/proto/website/website_stub.go @@ -0,0 +1,122 @@ +//go:build stub +// +build stub + +package website + +import ( + "context" + + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +type Event struct { + Type string `json:"type"` + Msg []byte `json:"msg"` +} + +func (e *Event) GetType() string { + return e.Type +} + +func (e *Event) GetMsg() []byte { + return e.Msg +} + +type Response struct { + Type string `json:"type"` + Err bool `json:"err"` + Msg []byte `json:"msg"` +} + +func (r *Response) GetType() string { + return r.Type +} + +func (r *Response) GetErr() bool { + return r.Err +} + +func (r *Response) GetMsg() []byte { + return r.Msg +} + +type Website_SubscribeServer interface { + Send(*Event) error + Recv() (*Response, error) + grpc.ServerStream +} + +type UnimplementedWebsiteServer struct{} + +func (UnimplementedWebsiteServer) Subscribe(stream Website_SubscribeServer) error { + return status.Errorf(codes.Unimplemented, "method Subscribe not implemented") +} + +func RegisterWebsiteServer(s grpc.ServiceRegistrar, srv WebsiteServer) { + s.RegisterService(&_Website_ServiceDesc, srv) +} + +type WebsiteServer interface { + Subscribe(Website_SubscribeServer) error +} + +var _Website_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "website.Website", + HandlerType: (*WebsiteServer)(nil), + Methods: []grpc.MethodDesc{}, + Streams: []grpc.StreamDesc{ + { + StreamName: "Subscribe", + Handler: nil, + ServerStreams: true, + ClientStreams: true, + }, + }, + Metadata: "website.proto", +} + +// Client-side types + +type WebsiteClient interface { + Subscribe(ctx context.Context, opts ...grpc.CallOption) (Website_SubscribeClient, error) +} + +type Website_SubscribeClient interface { + Send(*Response) error + Recv() (*Event, error) + grpc.ClientStream +} + +type websiteClient struct { + cc grpc.ClientConnInterface +} + +func NewWebsiteClient(cc grpc.ClientConnInterface) WebsiteClient { + return &websiteClient{cc} +} + +func (c *websiteClient) Subscribe(ctx context.Context, opts ...grpc.CallOption) (Website_SubscribeClient, error) { + stream, err := c.cc.NewStream(ctx, &_Website_ServiceDesc.Streams[0], "website.Website.Subscribe", opts...) + if err != nil { + return nil, err + } + return &websiteSubscribeClient{stream}, nil +} + +type websiteSubscribeClient struct { + grpc.ClientStream +} + +func (x *websiteSubscribeClient) Send(m *Response) error { + return x.ClientStream.SendMsg(m) +} + +func (x *websiteSubscribeClient) Recv() (*Event, error) { + m := new(Event) + if err := x.ClientStream.RecvMsg(m); err != nil { + return nil, err + } + return m, nil +} diff --git a/management/webserver/api/auth.go b/management/webserver/api/auth.go index 96022f0..1a3a416 100644 --- a/management/webserver/api/auth.go +++ b/management/webserver/api/auth.go @@ -140,7 +140,7 @@ func PostLogin(c *gin.Context) { return } - response.Error(c, response.JSONBody{Err: response.ErrorParamNotOK, Msg: "Password or passcode required"}, http.StatusBadRequest) + response.Error(c, response.JSONBody{Err: response.ErrInternalError, Msg: "Password or passcode required"}, http.StatusBadRequest) } func PostLogout(c *gin.Context) { diff --git a/management/webserver/go.mod b/management/webserver/go.mod index c13ca16..1b708b0 100644 --- a/management/webserver/go.mod +++ b/management/webserver/go.mod @@ -12,7 +12,6 @@ require ( github.com/gin-gonic/gin v1.10.0 github.com/pquerna/otp v1.4.0 github.com/robfig/cron/v3 v3.0.1 - github.com/rogpeppe/go-internal v1.10.0 github.com/sirupsen/logrus v1.4.2 golang.org/x/crypto v0.28.0 google.golang.org/grpc v1.65.0 @@ -24,37 +23,50 @@ require ( require ( github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect github.com/bytedance/sonic v1.11.6 // indirect - github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect + github.com/bytedance/sonic/loader v0.1.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect github.com/go-playground/validator/v10 v10.20.0 // indirect github.com/go-sql-driver/mysql v1.7.0 // indirect github.com/goccy/go-json v0.10.2 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/gorilla/context v1.1.1 // indirect github.com/gorilla/securecookie v1.1.1 // indirect github.com/gorilla/sessions v1.2.1 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect github.com/jackc/pgx/v5 v5.5.5 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/cpuid/v2 v2.2.7 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect + github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.4.0 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect + github.com/rogpeppe/go-internal v1.10.0 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect github.com/ugorji/go/codec v1.2.12 // indirect golang.org/x/arch v0.8.0 // indirect - golang.org/x/sys v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect - golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + golang.org/x/net v0.25.0 // indirect + golang.org/x/sync v0.8.0 // indirect + golang.org/x/sys v0.26.0 // indirect + golang.org/x/text v0.19.0 // indirect google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect + google.golang.org/protobuf v1.34.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/mysql v1.4.7 // indirect ) + +replace ( + chaitin.cn/dev/go/errors => ./stubs/chaitin.cn/dev/go/errors + chaitin.cn/dev/go/log => ./stubs/chaitin.cn/dev/go/log + chaitin.cn/dev/go/settings => ./stubs/chaitin.cn/dev/go/settings +) diff --git a/management/webserver/go.sum b/management/webserver/go.sum index c1e3978..5e593d0 100644 --- a/management/webserver/go.sum +++ b/management/webserver/go.sum @@ -1,54 +1,43 @@ -chaitin.cn/dev/go/errors v0.0.0-20200717101723-df6132d53dc8/go.mod h1:u+ZD0shdyUt0UG9XfCgD1R5mSqXpTVoO5rwQXQeo3Eo= -chaitin.cn/dev/go/errors v0.0.0-20210324055134-dc5247602af6 h1:1Qa9ABk907/9ZrOLbbRcS8Fqq9VhjAF/mLjbSP1qAJY= -chaitin.cn/dev/go/errors v0.0.0-20210324055134-dc5247602af6/go.mod h1:u+ZD0shdyUt0UG9XfCgD1R5mSqXpTVoO5rwQXQeo3Eo= -chaitin.cn/dev/go/log v0.0.0-20221220104336-05125760b10c h1:Xn9IYkxmnpDcEpV+7JIR5ufEIexd1dhqKwpOLG1mYOE= -chaitin.cn/dev/go/log v0.0.0-20221220104336-05125760b10c/go.mod h1:xJIYwUoA2TX5mNg/RBrEPyE251BPwj+70/mM7UIhoxg= -chaitin.cn/dev/go/settings v0.0.0-20221220104336-05125760b10c h1:tXsraF7o9iUsQY6IwpDJusc6OFhB7iv/bBTfgR3MPUU= -chaitin.cn/dev/go/settings v0.0.0-20221220104336-05125760b10c/go.mod h1:fUvtmpG8Z8Zf5aciadL9a/vn5SB3knG7pdNJixDplPg= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI= github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= -github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= -github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= -github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= +github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0= github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4= +github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= -github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= -github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0= +github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk= github.com/gin-contrib/sessions v0.0.5 h1:CATtfHmLMQrMNpJRgzjWXD7worTh7g7ritsQfmF+0jE= github.com/gin-contrib/sessions v0.0.5/go.mod h1:vYAuaUPqie3WUSsft6HUlCjlwwoJQs97miaG2+7neKY= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= -github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= +github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= -github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= -github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= +github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBExVwjEviJTixqxL8= github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc= github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= -github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU= github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 h1:au07oEsX2xN0ktxqI+Sida1w446QrXBRJ0nee3SNZlA= +github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang-sql/sqlexp v0.1.0 h1:ZCD6MBpcuOVfGVqsEmY5/4FtYiKz6tSyUv9LPEDei6A= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EOqtpKwwwHI= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= @@ -60,10 +49,10 @@ github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsI github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk= github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= -github.com/jackc/pgx/v5 v5.3.0 h1:/NQi8KHMpKWHInxXesC8yD4DhkXPrVhmnwYkjp9AmBA= -github.com/jackc/pgx/v5 v5.3.0/go.mod h1:t3JDKnCBlYIc0ewLF0Q7B8MXmoIaBOZj/ic7iHozM/8= +github.com/jackc/pgx/v5 v5.5.5 h1:amBjrZVmksIdNjxGW/IiIMzxMKZFelXbUoPNb+8sjQw= github.com/jackc/pgx/v5 v5.5.5/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A= -github.com/jackc/puddle/v2 v2.2.0/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= @@ -71,36 +60,31 @@ github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM= github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws= github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= -github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-sqlite3 v2.0.3+incompatible h1:gXHsfypPkaMZrKbD5209QV9jbUTJKjyR5WD3HYQSd+U= +github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/microsoft/go-mssqldb v0.17.0 h1:Fto83dMZPnYv1Zwx5vHHxpNraeEaUlQ/hhHLgZiaenE= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= +github.com/microsoft/go-mssqldb v0.17.0/go.mod h1:OkoNGhGEs8EZqchVTtochlXruEhEOaO4S0d2sB5aeGQ= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= -github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= +github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM= github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -108,7 +92,6 @@ github.com/pquerna/otp v1.4.0 h1:wZvl1TIVxKRThZIBiwOOHOGP/1+nZyWBil9Y2XNEDzg= github.com/pquerna/otp v1.4.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= @@ -120,89 +103,42 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= -github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= -github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= -github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= -golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc= golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= -golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58= -golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= -golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= -golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= -golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= -golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= +golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= +golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= -golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= -golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= +golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f h1:BWUVssLB0HVOSY78gIdvk1dTVYtT1y8SBWtPYuTJ/6w= google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f/go.mod h1:RGgjbofJ8xD9Sq1VVhDM1Vok1vRONV+rg+CjzG4SZKM= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc= google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -210,14 +146,14 @@ gorm.io/datatypes v1.1.1 h1:XAjO7NNfUKVUvnS3+BkqMrPXxCAcxDlpOYbjnizxNCw= gorm.io/datatypes v1.1.1/go.mod h1:u8GEgFjJ+GpsGfgHmBUcQqHm/937t3sj/SO9dvbndTg= gorm.io/driver/mysql v1.4.7 h1:rY46lkCspzGHn7+IYsNpSfEv9tA+SU4SkkB+GFX125Y= gorm.io/driver/mysql v1.4.7/go.mod h1:SxzItlnT1cb6e1e4ZRpgJN2VYtcqJgqnHxWr4wsP8oc= -gorm.io/driver/postgres v1.5.0 h1:u2FXTy14l45qc3UeCJ7QaAXZmZfDDv0YrthvmRq1l0U= -gorm.io/driver/postgres v1.5.0/go.mod h1:FUZXzO+5Uqg5zzwzv4KK49R8lvGIyscBOqYrtI1Ce9A= +gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU= +gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI= gorm.io/driver/sqlserver v1.4.1 h1:t4r4r6Jam5E6ejqP7N82qAJIJAht27EGT41HyPfXRw0= +gorm.io/driver/sqlserver v1.4.1/go.mod h1:DJ4P+MeZbc5rvY58PnmN1Lnyvb5gw5NPzGshHDnJLig= gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11 h1:9qNbmu21nNThCNnF5i2R3kw2aL27U8ZwbzccNjOmW0g= -gorm.io/gorm v1.24.7-0.20230306060331-85eaf9eeda11/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k= +gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s= gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8= nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/management/webserver/pkg/fvm/fvm_cgo.go b/management/webserver/pkg/fvm/fvm_cgo.go new file mode 100644 index 0000000..efe6061 --- /dev/null +++ b/management/webserver/pkg/fvm/fvm_cgo.go @@ -0,0 +1,270 @@ +//go:build !stub +// +build !stub + +package fvm + +/* +#cgo CFLAGS: -I../../submodule/fvm/include -I../../submodule/libct/include +#cgo LDFLAGS: -L../../submodule/fvm/lib -lfvm +#include +#include +#include +#include +#include +#include + +static inline fvm_update_t *build_update(const void* buf, size_t len) { + ct_string_t tmp = CT_STRING_FROM_PTR_LENGTH(buf, len); + return fvm_update_create(tmp); +} +*/ +import ( + "C" //nolint:typecheck +) +import ( + "crypto/tls" + "fmt" + "io" + "net/http" + "net/url" + "unsafe" + + "chaitin.cn/dev/go/errors" + "chaitin.cn/dev/go/log" +) + +// Constant for Output +const ( + OutputItemTable int = 0 + OutputItemSelector int = 1 + OutputItemTarget int = 2 +) + +// FVM wrapper +type FVM struct { + framework *C.fvm_framework_t + apiTable *C.char + version int64 +} + +type FVMUpdate struct { + update *C.fvm_update_t +} + +type FVMRe struct { + data []byte +} + +func maybePointer(array []byte) unsafe.Pointer { + if len(array) == 0 { + return nil + } + return unsafe.Pointer(&array[0]) +} + +func (u *FVMUpdate) ToBytes() []byte { + return C.GoBytes(unsafe.Pointer(u.update.buf.ptr), C.int(u.update.buf.length)) +} + +func (u *FVMUpdate) FromBytes(out []byte) error { + ptr := C.build_update(unsafe.Pointer(&out[0]), C.ulong(len(out))) + if ptr == nil { + return errors.New("failed to create update from db") + } + u.update = ptr + return nil +} + +func (u *FVMUpdate) MergeUpdate(patch *FVMUpdate) error { + m := C.fvm_update_merge(u.update, patch.update) + if m == nil { + return errors.New("failed to merge two updates") + } + C.fvm_update_destroy(u.update) + u.update = m + return nil +} + +func (u *FVMUpdate) Release() { + C.fvm_update_destroy(u.update) +} + +func (r *FVMRe) ToBytes() []byte { + return r.data +} + +func (r *FVMRe) FromBytes(o []byte) { + r.data = o +} + +type FVMOutput struct { + output *C.fvm_output_t +} + +// New creates FVM +func New() (*FVM, error) { + apiTable := C.fvm_api_table() + + fw := C.fvm_framework_acquire(nil) + if fw == nil { + return nil, errors.New("fvm_framework_acquire returns a null pointer") + } + + return &FVM{framework: fw, apiTable: apiTable, version: 0}, nil +} + +func (f *FVM) Update(upd *FVMUpdate) error { + if upd == nil || upd.update == nil { + return errors.New("null pointer passed to update") + } + ret := bool(C.fvm_update(f.framework, upd.update)) + if !ret { + return errors.New("update framework failed") + } + return nil +} + +func (f *FVM) Compile(text string, re []byte) (*FVMOutput, *FVMRe, error) { + cplPtr := C.fvm_compiler_acquire(f.apiTable) + cText := C.CString(text) + + defer C.fvm_compiler_release(cplPtr) + defer C.free(unsafe.Pointer(cText)) + + ok := C.fvm_compiler_load_re(cplPtr, (*C.char)(maybePointer(re)), C.ulong(len(re))) + if !ok { + return nil, nil, errors.New("failed to load re") + } + + outputPtr := C.fvm_compile(cplPtr, cText) + if outputPtr == nil { + return nil, nil, errors.New("compiling FSL failed") + } + + var cRePtr *C.char + var cReLen C.ulong + ok = C.fvm_compiler_dump_re(cplPtr, &cRePtr, &cReLen) + if !ok { + return nil, nil, errors.New("failed to dump re") + } + defer C.free(unsafe.Pointer(cRePtr)) + + cRe := &FVMRe{C.GoBytes(unsafe.Pointer(cRePtr), C.int(cReLen))} + + return &FVMOutput{outputPtr}, cRe, nil +} + +func (f *FVM) Plot() string { + plotP := C.fvm_plot(f.framework) + defer C.fvm_plot_destroy(plotP) + goBuf := C.GoBytes(unsafe.Pointer(plotP.buf.ptr), C.int(plotP.buf.length)) + return string(goBuf) +} + +func (f *FVM) Dump() *FVMUpdate { + return &FVMUpdate{C.fvm_dump(f.framework)} +} + +func (f *FVM) Release() { + C.fvm_framework_release(f.framework) +} + +func Serialize(out *FVMOutput, diff bool, base int64, target int64) *FVMUpdate { + updatePtr := C.fvm_serialize(out.output, C.bool(diff), C.long(base), C.long(target)) + if updatePtr == nil { + return nil + } + ctStrPtr := updatePtr.buf.ptr + if ctStrPtr == nil { + return nil + } + return &FVMUpdate{updatePtr} +} + +func ReleaseOutput(out *FVMOutput) { + C.fvm_output_destroy(out.output) +} + +func (f *FVM) PushFsl(server string, update *FVMUpdate) error { + log.Infof("Push FSL to %s", server) + + var length = uint32(update.update.buf.length) + var p = uintptr(unsafe.Pointer(update.update.buf.ptr)) + + log.Infof("Get update length %d, %d", length, C.int(update.update.buf.length)) + + u := &upload{ + Length: length, + P: p, + } + + base, _ := url.Parse(server) + base.Path = "/update/policy" + snURL := base.String() + req, err := http.NewRequest( + "POST", + snURL, + u, + ) + if err != nil { + return errors.Annotatef(err, "create request failed") + } + req.Header.Add("Content-Type", "application/octet-stream") + // req.Header.Set("Connection", "close") + + httpClient := &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + }, + } + + var ( + respErr error + resp *http.Response + ) + for i := 0; i < 3; i++ { + resp, respErr = httpClient.Do(req) + if respErr == nil { + break + } + } + if respErr != nil { + return errors.Annotatef(respErr, "Get response failed") + } + if resp != nil && resp.StatusCode != 200 { + bodyBytes, err := io.ReadAll(resp.Body) + if err != nil { + log.Fatal(err) + } + bodyString := string(bodyBytes) + + return errors.New(fmt.Sprintf("Push FSL response(%d %s)", resp.StatusCode, bodyString)) + } + + return nil +} + +type upload struct { + Length uint32 + off uint32 + P uintptr +} + +func (u *upload) Read(p []byte) (n int, err error) { + if u.off >= u.Length { + if len(p) == 0 { + return 0, nil + } + return 0, io.EOF + } + plen := uint32(len(p)) + var i uint32 + for i = 0; i < plen; i++ { + if i+u.off >= u.Length { + break + } + p[i] = *(*byte)(unsafe.Pointer(u.P + unsafe.Sizeof(p[0])*uintptr(i+u.off))) + } + u.off = i + u.off + return int(i), nil +} diff --git a/management/webserver/pkg/fvm/fvm_stub.go b/management/webserver/pkg/fvm/fvm_stub.go new file mode 100644 index 0000000..cb1d669 --- /dev/null +++ b/management/webserver/pkg/fvm/fvm_stub.go @@ -0,0 +1,139 @@ +//go:build stub +// +build stub + +package fvm + +import ( + "crypto/tls" + "fmt" + "io" + "net/http" + "net/url" + "sync" +) + +// Stub FVM implementation for compilation without native C library + +var ( + stubMu sync.Mutex + stubState = make(map[string][]byte) +) + +type FVM struct { + version int64 +} + +type FVMUpdate struct { + data []byte +} + +type FVMRe struct { + data []byte +} + +type FVMOutput struct { + data []byte +} + +func New() (*FVM, error) { + return &FVM{version: 0}, nil +} + +func (u *FVMUpdate) ToBytes() []byte { + return u.data +} + +func (u *FVMUpdate) FromBytes(out []byte) error { + u.data = make([]byte, len(out)) + copy(u.data, out) + return nil +} + +func (u *FVMUpdate) MergeUpdate(patch *FVMUpdate) error { + stubMu.Lock() + defer stubMu.Unlock() + merged := make([]byte, 0, len(u.data)+len(patch.data)) + merged = append(merged, u.data...) + merged = append(merged, patch.data...) + u.data = merged + return nil +} + +func (u *FVMUpdate) Release() { + u.data = nil +} + +func (r *FVMRe) ToBytes() []byte { + return r.data +} + +func (r *FVMRe) FromBytes(o []byte) { + r.data = make([]byte, len(o)) + copy(r.data, o) +} + +func (f *FVM) Update(upd *FVMUpdate) error { + stubMu.Lock() + defer stubMu.Unlock() + stubState["current"] = upd.data + return nil +} + +func (f *FVM) Compile(text string, re []byte) (*FVMOutput, *FVMRe, error) { + // Stub: return empty output + return &FVMOutput{data: []byte{}}, &FVMRe{data: []byte{}}, nil +} + +func (f *FVM) Plot() string { + return "{}" +} + +func (f *FVM) Dump() *FVMUpdate { + stubMu.Lock() + defer stubMu.Unlock() + data := stubState["current"] + return &FVMUpdate{data: data} +} + +func (f *FVM) Release() {} + +func Serialize(out *FVMOutput, diff bool, base int64, target int64) *FVMUpdate { + return &FVMUpdate{data: out.data} +} + +func ReleaseOutput(out *FVMOutput) {} + +func (f *FVM) PushFsl(server string, update *FVMUpdate) error { + base, _ := url.Parse(server) + base.Path = "/update/policy" + snURL := base.String() + + req, err := http.NewRequest("POST", snURL, nil) + if err != nil { + return fmt.Errorf("create request failed: %w", err) + } + req.Header.Add("Content-Type", "application/octet-stream") + + httpClient := &http.Client{ + Transport: &http.Transport{ + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + }, + } + + var resp *http.Response + for i := 0; i < 3; i++ { + resp, err = httpClient.Do(req) + if err == nil { + break + } + } + if err != nil { + return fmt.Errorf("Get response failed: %w", err) + } + if resp != nil && resp.StatusCode != 200 { + bodyBytes, _ := io.ReadAll(resp.Body) + return fmt.Errorf("Push FSL response(%d %s)", resp.StatusCode, string(bodyBytes)) + } + + return nil +} diff --git a/management/webserver/pkg/log/log.go b/management/webserver/pkg/log/log.go index 3af9a18..182e152 100644 --- a/management/webserver/pkg/log/log.go +++ b/management/webserver/pkg/log/log.go @@ -1,3 +1,6 @@ +//go:build !stub +// +build !stub + package log import ( diff --git a/management/webserver/pkg/log/log_stub.go b/management/webserver/pkg/log/log_stub.go new file mode 100644 index 0000000..b73bc48 --- /dev/null +++ b/management/webserver/pkg/log/log_stub.go @@ -0,0 +1,55 @@ +//go:build stub +// +build stub + +package log + +import ( + "fmt" + "os" + + "chaitin.cn/dev/go/log" + "chaitin.cn/patronus/safeline-2/management/webserver/pkg/config" +) + +func GetLogger(name string) *log.Logger { + return log.GetLogger(name) +} + +func LoadLogLevel() { + lv, _ := log.ParseLevel(config.GlobalConfig.Log.Level) + log.SetLevel(log.AllLoggers, lv) +} + +func SetLogFormatter() { + formatter := &log.TextFormatter{ + FullTimestamp: true, + TimestampFormat: "2006/01/02 15:04:05", + } + log.SetFormatter(log.AllLoggers, formatter) +} + +func InitLogger() error { + switch config.GlobalConfig.Log.Output { + case "stdout": + log.SetOutput(log.AllLoggers, os.Stdout) + case "stderr": + log.SetOutput(log.AllLoggers, os.Stderr) + default: + if config.GlobalConfig.Log.Output != "" { + fp, err := os.OpenFile(config.GlobalConfig.Log.Output, os.O_WRONLY|os.O_APPEND|os.O_CREATE, os.ModePerm) + if err != nil { + return fmt.Errorf("failed to open log file: %s", err.Error()) + } + log.SetOutput(log.AllLoggers, fp) + } + } + + LoadLogLevel() + return nil +} + +type RuntimeHook struct{} + +func NewRuntimeHook() *RuntimeHook { + return &RuntimeHook{} +} diff --git a/management/webserver/proto/website/website_stub.go b/management/webserver/proto/website/website_stub.go new file mode 100644 index 0000000..6ca4023 --- /dev/null +++ b/management/webserver/proto/website/website_stub.go @@ -0,0 +1,68 @@ +//go:build stub +// +build stub + +package website + +import ( + "google.golang.org/grpc" + "google.golang.org/grpc/codes" + "google.golang.org/grpc/status" +) + +type Event struct { + Type string `json:"type"` + Msg []byte `json:"msg"` +} + +type Response struct { + Type string `json:"type"` + Err bool `json:"err"` + Msg []byte `json:"msg"` +} + +func (r *Response) GetType() string { + return r.Type +} + +func (r *Response) GetErr() bool { + return r.Err +} + +func (r *Response) GetMsg() []byte { + return r.Msg +} + +type Website_SubscribeServer interface { + Send(*Event) error + Recv() (*Response, error) + grpc.ServerStream +} + +type UnimplementedWebsiteServer struct{} + +func (UnimplementedWebsiteServer) Subscribe(stream Website_SubscribeServer) error { + return status.Errorf(codes.Unimplemented, "method Subscribe not implemented") +} + +func RegisterWebsiteServer(s grpc.ServiceRegistrar, srv WebsiteServer) { + s.RegisterService(&_Website_ServiceDesc, srv) +} + +type WebsiteServer interface { + Subscribe(Website_SubscribeServer) error +} + +var _Website_ServiceDesc = grpc.ServiceDesc{ + ServiceName: "website.Website", + HandlerType: (*WebsiteServer)(nil), + Methods: []grpc.MethodDesc{}, + Streams: []grpc.StreamDesc{ + { + StreamName: "Subscribe", + Handler: nil, + ServerStreams: true, + ClientStreams: true, + }, + }, + Metadata: "website.proto", +} diff --git a/management/webserver/stubs/chaitin.cn/dev/go/errors/errors.go b/management/webserver/stubs/chaitin.cn/dev/go/errors/errors.go new file mode 100644 index 0000000..0715879 --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/errors/errors.go @@ -0,0 +1,44 @@ +package errors + +import ( + stderrors "errors" + "fmt" +) + +func New(text string) error { + return stderrors.New(text) +} + +func Annotate(err error, msg string) error { + if err == nil { + return nil + } + return fmt.Errorf("%s: %w", msg, err) +} + +func Annotatef(err error, format string, args ...interface{}) error { + if err == nil { + return nil + } + return fmt.Errorf("%s: %w", fmt.Sprintf(format, args...), err) +} + +func Errorf(format string, args ...interface{}) error { + return fmt.Errorf(format, args...) +} + +func Is(err, target error) bool { + return stderrors.Is(err, target) +} + +func As(err error, target interface{}) bool { + return stderrors.As(err, target) +} + +func Wrap(err error, msg string) error { + return Annotate(err, msg) +} + +func Wrapf(err error, format string, args ...interface{}) error { + return Annotatef(err, format, args...) +} diff --git a/management/webserver/stubs/chaitin.cn/dev/go/errors/go.mod b/management/webserver/stubs/chaitin.cn/dev/go/errors/go.mod new file mode 100644 index 0000000..96e6f90 --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/errors/go.mod @@ -0,0 +1,3 @@ +module chaitin.cn/dev/go/errors + +go 1.21 diff --git a/management/webserver/stubs/chaitin.cn/dev/go/log/go.mod b/management/webserver/stubs/chaitin.cn/dev/go/log/go.mod new file mode 100644 index 0000000..c401d27 --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/log/go.mod @@ -0,0 +1,3 @@ +module chaitin.cn/dev/go/log + +go 1.21 diff --git a/management/webserver/stubs/chaitin.cn/dev/go/log/log.go b/management/webserver/stubs/chaitin.cn/dev/go/log/log.go new file mode 100644 index 0000000..ea10c44 --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/log/log.go @@ -0,0 +1,212 @@ +package log + +import ( + "fmt" + "io" + "log" + "os" + "sync" +) + +type Level int + +const ( + PanicLevel Level = iota + FatalLevel + ErrorLevel + WarnLevel + InfoLevel + DebugLevel + TraceLevel +) + +var AllLoggers = []Level{InfoLevel} + +type Logger struct { + name string + level Level + output io.Writer + mu sync.Mutex +} + +type TextFormatter struct { + FullTimestamp bool + TimestampFormat string +} + +var loggers = make(map[string]*Logger) +var loggersMu sync.Mutex + +func GetLogger(name string) *Logger { + loggersMu.Lock() + defer loggersMu.Unlock() + + if l, ok := loggers[name]; ok { + return l + } + + logger := &Logger{ + name: name, + level: InfoLevel, + output: os.Stderr, + } + loggers[name] = logger + return logger +} + +func ParseLevel(s string) (Level, error) { + switch s { + case "panic": + return PanicLevel, nil + case "fatal": + return FatalLevel, nil + case "error": + return ErrorLevel, nil + case "warn", "warning": + return WarnLevel, nil + case "info": + return InfoLevel, nil + case "debug": + return DebugLevel, nil + case "trace": + return TraceLevel, nil + default: + return InfoLevel, fmt.Errorf("unknown level: %s", s) + } +} + +func SetLevel(levels []Level, level Level) { + loggersMu.Lock() + defer loggersMu.Unlock() + for _, l := range loggers { + l.level = level + } +} + +func SetFormatter(levels []Level, formatter *TextFormatter) { + // No-op for stub +} + +func SetOutput(levels []Level, output io.Writer) { + loggersMu.Lock() + defer loggersMu.Unlock() + for _, l := range loggers { + l.output = output + } +} + +func NewLockOutput(w io.Writer) io.Writer { + return w +} + +type ErrorStackHook struct { + enabled bool +} + +func NewErrorStackHook(enabled bool) *ErrorStackHook { + return &ErrorStackHook{enabled: enabled} +} + +func (h *ErrorStackHook) Levels() []Level { + return AllLoggers +} + +func (h *ErrorStackHook) Fire(entry *struct{}) error { + return nil +} + +func AddHook(levels []Level, hook interface{}) { + // No-op for stub +} + +func (l *Logger) log(level, format string, args ...interface{}) { + l.mu.Lock() + defer l.mu.Unlock() + msg := fmt.Sprintf("[%s] [%s] %s", l.name, level, fmt.Sprintf(format, args...)) + log.Println(msg) +} + +func (l *Logger) Infof(format string, args ...interface{}) { + l.log("INFO", format, args...) +} + +func (l *Logger) Debugf(format string, args ...interface{}) { + l.log("DEBUG", format, args...) +} + +func (l *Logger) Warnf(format string, args ...interface{}) { + l.log("WARN", format, args...) +} + +func (l *Logger) Errorf(format string, args ...interface{}) { + l.log("ERROR", format, args...) +} + +func (l *Logger) Fatalf(format string, args ...interface{}) { + l.log("FATAL", format, args...) + os.Exit(1) +} + +func (l *Logger) Fatal(args ...interface{}) { + l.log("FATAL", "%v", args) + os.Exit(1) +} + +func (l *Logger) Fatalln(args ...interface{}) { + l.log("FATAL", "%v", args) + os.Exit(1) +} + +func (l *Logger) Info(args ...interface{}) { + l.log("INFO", "%v", args) +} + +func (l *Logger) Infoln(args ...interface{}) { + l.log("INFO", "%v", args) +} + +func (l *Logger) Error(args ...interface{}) { + l.log("ERROR", "%v", args) +} + +func (l *Logger) Errorln(args ...interface{}) { + l.log("ERROR", "%v", args) +} + +func (l *Logger) Warn(args ...interface{}) { + l.log("WARN", "%v", args) +} + +func (l *Logger) Warnln(args ...interface{}) { + l.log("WARN", "%v", args) +} + +func (l *Logger) Debug(args ...interface{}) { + l.log("DEBUG", "%v", args) +} + +func (l *Logger) Debugln(args ...interface{}) { + l.log("DEBUG", "%v", args) +} + +func (l *Logger) WithError(err error) *Logger { + return l +} + +func (l *Logger) WithField(key string, value interface{}) *Logger { + return l +} + +func Infof(format string, args ...interface{}) { + log.Printf("[INFO] "+format, args...) +} + +func Fatalf(format string, args ...interface{}) { + log.Printf("[FATAL] "+format, args...) + os.Exit(1) +} + +func Fatal(args ...interface{}) { + log.Printf("[FATAL] %v", args) + os.Exit(1) +} diff --git a/management/webserver/stubs/chaitin.cn/dev/go/settings/go.mod b/management/webserver/stubs/chaitin.cn/dev/go/settings/go.mod new file mode 100644 index 0000000..1b37e20 --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/settings/go.mod @@ -0,0 +1,3 @@ +module chaitin.cn/dev/go/settings + +go 1.21 diff --git a/management/webserver/stubs/chaitin.cn/dev/go/settings/settings.go b/management/webserver/stubs/chaitin.cn/dev/go/settings/settings.go new file mode 100644 index 0000000..369309e --- /dev/null +++ b/management/webserver/stubs/chaitin.cn/dev/go/settings/settings.go @@ -0,0 +1,151 @@ +package settings + +import ( + "os" + "strconv" +) + +var globalSetting *Setting + +type Setting struct { + values map[string]interface{} +} + +func New(configPath string) (*Setting, error) { + s := &Setting{ + values: make(map[string]interface{}), + } + + // Try to load from environment variables with prefix + prefix := "SAFELINE_" + for _, env := range os.Environ() { + key := env + val := "" + for i := 0; i < len(env); i++ { + if env[i] == '=' { + key = env[:i] + val = env[i+1:] + break + } + } + if len(key) > len(prefix) && key[:len(prefix)] == prefix { + s.values[key[len(prefix):]] = val + } + } + + // Also load from config file if it exists + if _, err := os.Stat(configPath); err == nil { + data, err := os.ReadFile(configPath) + if err == nil { + // Simple line-by-line parsing for YAML-like config + lines := splitLines(string(data)) + for _, line := range lines { + if len(line) == 0 || line[0] == '#' { + continue + } + for i := 0; i < len(line); i++ { + if line[i] == ':' { + key := trimSpace(line[:i]) + val := trimSpace(line[i+1:]) + if len(val) >= 2 && val[0] == '"' && val[len(val)-1] == '"' { + val = val[1 : len(val)-1] + } + s.values[key] = val + break + } + } + } + } + } + + globalSetting = s + return s, nil +} + +func Unmarshal(key string, dest interface{}) error { + if globalSetting == nil { + return nil + } + return globalSetting.Unmarshal(key, dest) +} + +func (s *Setting) Unmarshal(key string, dest interface{}) error { + if val, ok := s.values[key]; ok { + switch v := dest.(type) { + case *string: + *v, _ = val.(string) + case *int: + if str, ok := val.(string); ok { + *v, _ = strconv.Atoi(str) + } + case *bool: + if str, ok := val.(string); ok { + *v = str == "true" || str == "1" + } + } + } + return nil +} + +func (s *Setting) Get(key string, defaultVal interface{}) interface{} { + if val, ok := s.values[key]; ok { + return val + } + return defaultVal +} + +func (s *Setting) GetString(key, defaultVal string) string { + if val, ok := s.values[key]; ok { + if str, ok := val.(string); ok { + return str + } + } + return defaultVal +} + +func (s *Setting) GetInt(key string, defaultVal int) int { + if val, ok := s.values[key]; ok { + if str, ok := val.(string); ok { + if i, err := strconv.Atoi(str); err == nil { + return i + } + } + } + return defaultVal +} + +func (s *Setting) GetBool(key string, defaultVal bool) bool { + if val, ok := s.values[key]; ok { + if str, ok := val.(string); ok { + return str == "true" || str == "1" + } + } + return defaultVal +} + +func splitLines(s string) []string { + var lines []string + start := 0 + for i := 0; i < len(s); i++ { + if s[i] == '\n' { + lines = append(lines, s[start:i]) + start = i + 1 + } + } + if start < len(s) { + lines = append(lines, s[start:]) + } + return lines +} + +func trimSpace(s string) string { + start := 0 + end := len(s) + for start < end && (s[start] == ' ' || s[start] == '\t') { + start++ + } + for end > start && (s[end-1] == ' ' || s[end-1] == '\t') { + end-- + } + return s[start:end] +} diff --git a/submodule/fvm/include/fvm-c/compiler.h b/submodule/fvm/include/fvm-c/compiler.h new file mode 100644 index 0000000..7e735e1 --- /dev/null +++ b/submodule/fvm/include/fvm-c/compiler.h @@ -0,0 +1,19 @@ +#ifndef FVM_COMPILER_H +#define FVM_COMPILER_H + +#include +#include + +typedef struct fvm_compiler fvm_compiler_t; +typedef struct fvm_output fvm_output_t; + +fvm_compiler_t *fvm_compiler_acquire(const char *api_table); +void fvm_compiler_release(fvm_compiler_t *compiler); + +bool fvm_compiler_load_re(fvm_compiler_t *compiler, const char *re, size_t re_len); +bool fvm_compiler_dump_re(fvm_compiler_t *compiler, char **out, size_t *out_len); + +fvm_output_t *fvm_compile(fvm_compiler_t *compiler, const char *text); +void fvm_output_destroy(fvm_output_t *output); + +#endif diff --git a/submodule/fvm/include/fvm-c/framework.h b/submodule/fvm/include/fvm-c/framework.h new file mode 100644 index 0000000..928c6ea --- /dev/null +++ b/submodule/fvm/include/fvm-c/framework.h @@ -0,0 +1,11 @@ +#ifndef FVM_FRAMEWORK_H +#define FVM_FRAMEWORK_H + +#include + +typedef struct fvm_framework fvm_framework_t; + +fvm_framework_t *fvm_framework_acquire(void *config); +void fvm_framework_release(fvm_framework_t *fw); + +#endif diff --git a/submodule/fvm/include/fvm-c/plot.h b/submodule/fvm/include/fvm-c/plot.h new file mode 100644 index 0000000..9fd9928 --- /dev/null +++ b/submodule/fvm/include/fvm-c/plot.h @@ -0,0 +1,13 @@ +#ifndef FVM_PLOT_H +#define FVM_PLOT_H + +#include + +typedef struct { + ct_string_t buf; +} fvm_plot_t; + +fvm_plot_t *fvm_plot(fvm_framework_t *fw); +void fvm_plot_destroy(fvm_plot_t *plot); + +#endif diff --git a/submodule/fvm/include/fvm-c/update.h b/submodule/fvm/include/fvm-c/update.h new file mode 100644 index 0000000..f94bcf8 --- /dev/null +++ b/submodule/fvm/include/fvm-c/update.h @@ -0,0 +1,14 @@ +#ifndef FVM_UPDATE_H +#define FVM_UPDATE_H + +#include + +typedef struct { + ct_string_t buf; +} fvm_update_t; + +fvm_update_t *fvm_update_create(ct_string_t data); +fvm_update_t *fvm_update_merge(fvm_update_t *base, fvm_update_t *patch); +void fvm_update_destroy(fvm_update_t *update); + +#endif diff --git a/submodule/fvm/lib/libfvm.a b/submodule/fvm/lib/libfvm.a new file mode 100644 index 0000000..8b277f0 --- /dev/null +++ b/submodule/fvm/lib/libfvm.a @@ -0,0 +1 @@ +! diff --git a/submodule/fvm/src/fvm_stub.c b/submodule/fvm/src/fvm_stub.c new file mode 100644 index 0000000..49e4946 --- /dev/null +++ b/submodule/fvm/src/fvm_stub.c @@ -0,0 +1,129 @@ +#include +#include +#include +#include +#include +#include +#include + +// Stub implementation - all functions return dummy values +// This allows the Go webserver to compile without the real FVM library + +struct fvm_framework { + int dummy; +}; + +struct fvm_compiler { + const char *api_table; +}; + +struct fvm_output { + int dummy; +}; + +// Framework +fvm_framework_t *fvm_framework_acquire(void *config) { + fvm_framework_t *fw = (fvm_framework_t *)calloc(1, sizeof(fvm_framework_t)); + return fw; +} + +void fvm_framework_release(fvm_framework_t *fw) { + if (fw) free(fw); +} + +int fvm_update(fvm_framework_t *fw, fvm_update_t *update) { + // Stub: always succeed + return 1; +} + +// Update +fvm_update_t *fvm_update_create(ct_string_t data) { + fvm_update_t *u = (fvm_update_t *)calloc(1, sizeof(fvm_update_t)); + if (u) { + u->buf.ptr = (char *)malloc(data.length); + if (u->buf.ptr) { + memcpy((char *)u->buf.ptr, data.ptr, data.length); + u->buf.length = data.length; + } + } + return u; +} + +fvm_update_t *fvm_update_merge(fvm_update_t *base, fvm_update_t *patch) { + // Stub: just return a copy of base + if (!base) return NULL; + fvm_update_t *merged = (fvm_update_t *)calloc(1, sizeof(fvm_update_t)); + if (merged && base->buf.ptr) { + merged->buf.ptr = (char *)malloc(base->buf.length); + if (merged->buf.ptr) { + memcpy((char *)merged->buf.ptr, base->buf.ptr, base->buf.length); + merged->buf.length = base->buf.length; + } + } + return merged; +} + +void fvm_update_destroy(fvm_update_t *update) { + if (update) { + if (update->buf.ptr) free((void *)update->buf.ptr); + free(update); + } +} + +// Plot +fvm_plot_t *fvm_plot(fvm_framework_t *fw) { + fvm_plot_t *p = (fvm_plot_t *)calloc(1, sizeof(fvm_plot_t)); + if (p) { + const char *empty = "{}"; + p->buf.ptr = strdup(empty); + p->buf.length = strlen(empty); + } + return p; +} + +void fvm_plot_destroy(fvm_plot_t *plot) { + if (plot) { + if (plot->buf.ptr) free((void *)plot->buf.ptr); + free(plot); + } +} + +// Dump +fvm_update_t *fvm_dump(fvm_framework_t *fw) { + return fvm_update_create(CT_STRING_FROM_CSTR("")); +} + +// Compiler +fvm_compiler_t *fvm_compiler_acquire(const char *api_table) { + fvm_compiler_t *c = (fvm_compiler_t *)calloc(1, sizeof(fvm_compiler_t)); + if (c) c->api_table = api_table; + return c; +} + +void fvm_compiler_release(fvm_compiler_t *compiler) { + if (compiler) free(compiler); +} + +bool fvm_compiler_load_re(fvm_compiler_t *compiler, const char *re, size_t re_len) { + return true; +} + +bool fvm_compiler_dump_re(fvm_compiler_t *compiler, char **out, size_t *out_len) { + *out = strdup(""); + *out_len = 0; + return true; +} + +fvm_output_t *fvm_compile(fvm_compiler_t *compiler, const char *text) { + fvm_output_t *o = (fvm_output_t *)calloc(1, sizeof(fvm_output_t)); + return o; +} + +fvm_output_t *fvm_serialize(fvm_output_t *output, bool diff, long base, long target) { + fvm_output_t *o = (fvm_output_t *)calloc(1, sizeof(fvm_output_t)); + return o; +} + +void fvm_output_destroy(fvm_output_t *output) { + if (output) free(output); +} diff --git a/submodule/libct/include/ct/string.h b/submodule/libct/include/ct/string.h new file mode 100644 index 0000000..cbc58eb --- /dev/null +++ b/submodule/libct/include/ct/string.h @@ -0,0 +1,27 @@ +#ifndef CT_STRING_H +#define CT_STRING_H + +#include +#include +#include + +typedef struct { + const char *ptr; + size_t length; +} ct_string_t; + +static inline ct_string_t CT_STRING_FROM_PTR_LENGTH(const void *buf, size_t len) { + ct_string_t s; + s.ptr = (const char *)buf; + s.length = len; + return s; +} + +static inline ct_string_t CT_STRING_FROM_CSTR(const char *str) { + ct_string_t s; + s.ptr = str; + s.length = str ? strlen(str) : 0; + return s; +} + +#endif