workflow调整

.github/workflows/linux_mac_native.yml

@@ -30,7 +30,7 @@ jobs:
       run: |
         cd neutrino-proxy-admin
         npm install
-        npm run build:docker·
+        npm run build:docker
         cp -rf ./dist/ ./../neutrino-proxy-server/src/main/resources/static/
     - name: GitHub Action for GraalVM JDK 21
       uses: graalvm/setup-graalvm@v1
@@ -45,34 +45,55 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
     - name: Build with Maven (neutrino-proxy-server)
       run: |
         mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
         cd neutrino-proxy-server 
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
         chmod +x target/neutrino-proxy-server
-        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ github.ref_name }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ github.ref_name }}/app.yml
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-server)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-server-${{ github.ref_name }}'
-        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
     - name: Build with Maven (neutrino-proxy-client)
       run: |
         cd neutrino-proxy-client
         mvn clean package --file pom.xml --no-transfer-progress
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
         chmod +x target/neutrino-proxy-client
-        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ github.ref_name }}
-        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ github.ref_name }}/app.yml
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-client)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-client-${{ github.ref_name }}'
-        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
     # GitHub 上创建 release
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -81,7 +102,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
-          neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         prerelease: true
         token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-native.yml

@@ -44,32 +44,55 @@ jobs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+    - name: Set vars
+      shell: bash
+      run: |
+        OS=$(echo '${{ runner.os }}' | awk '{print tolower($0)}')
+        [[ $OS == 'ubuntu' ]] && echo "OS=linux" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        [[ $OS == 'macos' ]] && echo "OS=darwin" >> $GITHUB_ENV || echo "OS=$OS" >> $GITHUB_ENV
+        echo "VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)" >> $GITHUB_ENV
     - name: Build with Maven (neutrino-proxy-server)
       run: |
         set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
         mvn clean install -pl neutrino-proxy-core -am -DskipTests --no-transfer-progress
         cd neutrino-proxy-server
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server.exe
+        mkdir ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-server.exe ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-server.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-server)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-server.exe'
-        filename: neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
     - name: Build with Maven (neutrino-proxy-client)
       run: |
         set MAVEN_OPTS="-Duser.language=UTF-8 -Dfile.encoding=UTF-8"
         cd neutrino-proxy-client
         mvn clean package --file pom.xml --no-transfer-progress
         mvn clean native:compile -P native --file pom.xml --no-transfer-progress
-        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client.exe
+        mkdir ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native
+        cp target/neutrino-proxy-client.exe ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/neutrino-proxy-client.exe
+        cp target/classes/app-copy.yml ./../neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native/app.yml
     - name: Archive zip (neutrino-proxy-client)
       uses: thedoctor0/zip-release@master
       with:
         type: 'zip'
-        path: 'neutrino-proxy-client.exe'
-        filename: neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+        path: 'neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native'
+        filename: neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+    # 上传构建产物
+    - name: Upload artifact
+      uses: actions/[email protected]
+      with:
+        name: neutrino-proxy-server-client-${{ env.OS }}-${{ env.VERSION }}
+        path: |
+          neutrino-proxy-server/target/neutrino-proxy-server.jar
+          neutrino-proxy-client/target/neutrino-proxy-client.jar
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
+        # 保存时间，默认 90 天
+        retention-days: 5
     # GitHub 上创建 release
     - name: Release
       uses: softprops/action-gh-release@v1
@@ -78,7 +101,7 @@ jobs:
         files: |
           neutrino-proxy-server/target/neutrino-proxy-server.jar
           neutrino-proxy-client/target/neutrino-proxy-client.jar
-          neutrino-proxy-server-${{ matrix.os }}-${{ github.ref_name }}.zip
-          neutrino-proxy-client-${{ matrix.os }}-${{ github.ref_name }}.zip
+          neutrino-proxy-server-${{ env.OS }}-${{ env.VERSION }}-native.zip
+          neutrino-proxy-client-${{ env.OS }}-${{ env.VERSION }}-native.zip
         prerelease: true
         token: ${{ secrets.GITHUB_TOKEN }}

VLog.md

@@ -75,7 +75,7 @@
 
 ## 2.0.1
 - jdk版本升级为21
-- native部署，后台新增提交到后端，数据库乱码问题
-- 解决HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
-- [ ] 支持被代理服务获取访问者真实ip
-- [ ] 支持对用户、license限速
+- 新增安全组模块，支持黑名单、白名单限制
+- 支持对用户、license限速
+- 修复HTTP(S)映射时使用tcp端口访问正常，使用域名访问偶现一直loading的问题
+- 修复HTTP(S)映射时使用映射的域名上传文件时，连接中断的问题

neutrino-proxy-core/src/main/java/org/dromara/neutrinoproxy/core/Constants.java

@@ -50,6 +50,8 @@ public interface Constants {
     AttributeKey<InetSocketAddress> SENDER = AttributeKey.newInstance("sender");
 
     AttributeKey<Integer> SERVER_PORT = AttributeKey.newInstance("serverPort");
+    AttributeKey<String> REAL_REMOTE_IP = AttributeKey.newInstance("realRemoteIp");
+
 
     AttributeKey<Boolean> FLOW_LIMITER_FLAG = AttributeKey.newInstance("flowLimiterFlag");
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/proxy/security/HttpVisitorSecurityChannelHandler.java

@@ -39,47 +39,52 @@ public class HttpVisitorSecurityChannelHandler extends ChannelInboundHandlerAdap
         }
 
         ByteBuf buf = (ByteBuf) msg;
-        byte[] bytes = new byte[buf.readableBytes()];
-        buf.readBytes(bytes);
 
-        // 获取Host请求头
-        String httpContent = new String(bytes);
-        String host = HttpUtil.getHostIgnorePort(httpContent);
-
-        log.debug("HttpProxy host: {}", host);
-        if (StringUtils.isBlank(host)) {
-            ctx.channel().close();
-            return;
-        }
-
-        // 根据Host匹配端口映射
-        if (!host.endsWith(domainName)) {
-            ctx.channel().close();
-            return;
-        }
-        int index = host.lastIndexOf("." + domainName);
-        String subdomain = host.substring(0, index);
-
-        // 根据域名拿到绑定的映射对应的cmdChannel
-        Integer serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+        Integer serverPort = ctx.channel().attr(Constants.SERVER_PORT).get();
         if (null == serverPort) {
-            ctx.channel().close();
-            return;
-        }
+            // 获取Host请求头
+            byte[] bytes = new byte[buf.readableBytes()];
+            buf.readBytes(bytes);
+            String httpContent = new String(bytes);
+            String host = HttpUtil.getHostIgnorePort(httpContent);
 
-        // 判断IP是否在该端口绑定的安全组允许的规则内
-        String ip = IpUtil.getRealRemoteIp(httpContent);
-        if (ip == null) {
-            ip = IpUtil.getRemoteIp(ctx);
-        }
-        if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
-            // 不在安全组规则放行范围内
-            ctx.channel().close();
-            return;
+            log.debug("HttpProxy host: {}", host);
+            if (StringUtils.isBlank(host)) {
+                ctx.channel().close();
+                return;
+            }
+
+            // 根据Host匹配端口映射
+            if (!host.endsWith(domainName)) {
+                ctx.channel().close();
+                return;
+            }
+            int index = host.lastIndexOf("." + domainName);
+            String subdomain = host.substring(0, index);
+
+            // 根据域名拿到绑定的映射对应的cmdChannel
+            serverPort = ProxyUtil.getServerPortBySubdomain(subdomain);
+            if (null == serverPort) {
+                ctx.channel().close();
+                return;
+            }
+
+            // 判断IP是否在该端口绑定的安全组允许的规则内
+            String ip = IpUtil.getRealRemoteIp(httpContent);
+            if (ip == null) {
+                ip = IpUtil.getRemoteIp(ctx);
+            }
+            if (!securityGroupService.judgeAllow(ip, portMappingService.getSecurityGroupIdByMappingPort(serverPort))) {
+                // 不在安全组规则放行范围内
+                ctx.channel().close();
+                return;
+            }
+
+            ctx.channel().attr(Constants.REAL_REMOTE_IP).set(ip);
+            ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
         }
 
         // 继续传播
-        ctx.channel().attr(Constants.SERVER_PORT).set(serverPort);
         buf.resetReaderIndex();
         ctx.fireChannelRead(buf);
     }

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java

@@ -138,7 +138,9 @@ public class PortMappingService implements LifecycleBean {
             }
         });
         //sorted [userId asc] [licenseId asc] [createTime asc]
-        respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
+        respList = respList.stream()
+            .filter(e -> null != e.getUserId())
+            .sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
         return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }
 

neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/util/StringUtil.java

@@ -15,7 +15,7 @@ public class StringUtil {
     private static final Integer BYTES_MUL_GB = BYTES_MUL_MB * 1024;
     private static final String[] BYTES_UNIT_STR = {"B", "K", "KB", "M", "MB", "G", "GB"};
     private static final Integer[] BYTES_UNIT_MUL = {1, BYTES_MUL_KB, BYTES_MUL_KB, BYTES_MUL_MB, BYTES_MUL_MB, BYTES_MUL_GB, BYTES_MUL_GB};
-    private static final String BYTES_DESC_REGEX = "\\s*(\\d+)\\s*(B|K|KB|M|MB|G|GB)\\s*";
+    private static final String BYTES_DESC_REGEX = "\\s*(\\d+\\.*\\d*)\\s*(B|K|KB|M|MB|G|GB)\\s*";
     private static final Pattern BYTES_DESC_PATTERN = Pattern.compile(BYTES_DESC_REGEX);
 
     /**
@@ -46,14 +46,14 @@ public class StringUtil {
             if (!found) {
                 return null;
             }
-            Integer n = Integer.parseInt(matcher.group(1));
+            Double n = Double.parseDouble(matcher.group(1));
             String unit = matcher.group(2);
             Integer unitIndex = getBytesUnitIndex(unit);
             if (null == unitIndex) {
                 return null;
             }
 
-            return (long)n * BYTES_UNIT_MUL[unitIndex];
+            return (long)(n * BYTES_UNIT_MUL[unitIndex]);
         } catch (Exception e) {
             // ignore
         }

neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/VersionTest.java

@@ -1,19 +0,0 @@
-package org.dromara.neutrinoproxy.server;
-
-import org.dromara.neutrinoproxy.core.util.NeutrinoProxyVersion;
-import org.dromara.neutrinoproxy.server.app.AppBaseTest;
-import org.junit.Assert;
-import org.junit.Test;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:51
- */
-public class VersionTest extends AppBaseTest {
-
-    @Test
-    public void testVersion() {
-        Assert.assertNotNull(NeutrinoProxyVersion.getVersion());
-        System.out.println("version: " + NeutrinoProxyVersion.getVersion());
-    }
-}

neutrino-proxy-server/src/test/java/org/dromara/neutrinoproxy/server/app/AppBaseTest.java

@@ -1,15 +0,0 @@
-package org.dromara.neutrinoproxy.server.app;
-
-import org.dromara.neutrinoproxy.server.ProxyServer;
-import org.junit.runner.RunWith;
-import org.noear.solon.test.SolonJUnit4ClassRunner;
-import org.noear.solon.test.SolonTest;
-
-/**
- * @author songyinyin
- * @since 2023/10/31 11:56
- */
-@SolonTest(value = ProxyServer.class, properties = "server.port=18888")
-@RunWith(SolonJUnit4ClassRunner.class)
-public class AppBaseTest {
-}