added CI/CD

Author: Andcool-Systems

.github/workflows/gradle.yml

@@ -42,3 +42,36 @@ jobs:
           name: build-artifacts
           path: |
             build/libs/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: [build]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install SSH and SCP
+        run: sudo apt-get update && sudo apt-get install -y openssh-client sshpass
+
+      - name: Download env file
+        uses: actions/download-artifact@v4
+        with:
+          name: build-artifacts
+          path: .
+
+      - name: Upload sources
+        env:
+          SSHPASS: ${{ secrets.ROOT_SSH_PASSWORD }}
+        run: |
+          sshpass -e scp -o StrictHostKeyChecking=no -r ./mc-oauth-all.jar root@${{ secrets.SERVER_IP }}:/home/andcoolsystems/server
+
+      - name: Extract build artifacts on server
+        env:
+          SSHPASS: ${{ secrets.ROOT_SSH_PASSWORD }}
+        run: |
+          sshpass -e ssh -o StrictHostKeyChecking=no root@${{ secrets.SERVER_IP }} << 'EOF'
+            cd /home/andcoolsystems/server
+            docker compose build
+            docker compose up -d
+          EOF

Dockerfile

@@ -1,9 +1,6 @@
-FROM openjdk:17-jdk-slim
+FROM openjdk:21
 WORKDIR /app
 
 COPY . .
 
-CMD ["java", "-jar", "test_auth.jar"]
-
-EXPOSE 8089
-EXPOSE 25565
+CMD ["java", "-jar", "mc-oauth-all.jar"]

build.gradle

@@ -4,7 +4,7 @@ plugins {
 }
 
 group = "ru.andcool"
-version = "1.0-SNAPSHOT"
+version = ""
 
 repositories {
     mavenCentral()

config.json

@@ -0,0 +1,10 @@
+{
+    "PLAYERS_MAX": 0,
+    "PORT_SERVER": 25565,
+    "SERVER_ID": "mc-oauth",
+    "PROTOCOL_VERSION": -1,
+    "MOTD": "",
+    "SERVER_VERSION": "1.20.4",
+    "PLAYERS_NOW": 0,
+    "PORT_API": 8089
+}

docker-compose.yaml

@@ -0,0 +1,18 @@
+version: "3"
+
+services:
+  mc-oauth:
+    container_name: mc-oauth
+    build:
+      context: .
+      dockerfile: Dockerfile
+    restart: always
+    ports:
+      - 25565:25565
+    networks:
+      - nginx
+
+networks:
+  nginx:
+    external: true
+    name: nginx

settings.gradle

@@ -1,2 +1,2 @@
-rootProject.name = "test_auth"
+rootProject.name = "mc-oauth"
 

src/main/java/com/andcool/config/UserConfig.java

@@ -36,7 +36,7 @@ public static void save() {
             Files.createDirectories(configFile.toPath().getParent());
             Files.writeString(configFile.toPath(), jsonConfig.toString(4));
         } catch (IOException e) {
-            OAuthServer.logger.log(Level.ERROR, e.toString());
+            OAuthServer.logger.log(Level.DEBUG, e.toString());
         }
     }
 

src/main/java/com/andcool/handlers/Encryption.java

@@ -27,7 +27,7 @@ public Encryption(SecretKey sharedSecret) {
             encodeBuf = new CryptBuf(Cipher.ENCRYPT_MODE, sharedSecret);
             decodeBuf = new CryptBuf(Cipher.DECRYPT_MODE, sharedSecret);
         } catch (GeneralSecurityException e) {
-            OAuthServer.logger.log(Level.ERROR, e.toString());
+            OAuthServer.logger.log(Level.DEBUG, e.toString());
             throw new AssertionError("Failed to initialize encrypted channel", e);
         }
     }

src/main/java/com/andcool/handlers/EncryptionHandler.java

@@ -48,7 +48,7 @@ public static void handleEncryptionResponse(ChannelHandlerContext ctx, ByteBuf i
             byte[] verifyToken = rsaCipher.doFinal(encryptedVerifyToken);
 
             if (!Arrays.equals(OAuthServer.VERIFY_TOKEN, verifyToken)) {
-                OAuthServer.logger.log(Level.ERROR, "Invalid verify token");
+                OAuthServer.logger.log(Level.DEBUG, "Invalid verify token");
                 SessionHandler.disconnect(ctx, "Error while encryption!");
                 return;
             } else {
@@ -81,7 +81,7 @@ public static void handleEncryptionResponse(ChannelHandlerContext ctx, ByteBuf i
 
             OAuthServer.logger.log(Level.INFO, "Created code " + code + " for " + session.nickname);
         } catch (IOException | InterruptedException | InvalidKeyException | NoSuchAlgorithmException | BadPaddingException | IllegalBlockSizeException | NoSuchPaddingException | JSONException e) {
-            OAuthServer.logger.log(Level.ERROR, "Exception in handleEncryptionResponse: " + e.toString());
+            OAuthServer.logger.log(Level.DEBUG, "Exception in handleEncryptionResponse: " + e.toString());
         } finally {
             //in.release(); // Освобождение буфера
         }

src/main/java/com/andcool/session/SessionHandler.java

@@ -53,17 +53,17 @@ protected void channelRead0(ChannelHandlerContext ctx, ByteBuf in) throws Except
                         EncryptionHandler.handleEncryptionResponse(ctx, in, session);
                     }
                 }
-                default -> OAuthServer.logger.log(Level.ERROR, "Invalid packet ID: " + packetId);
+                default -> OAuthServer.logger.log(Level.DEBUG, "Invalid packet ID: " + packetId);
             }
         }catch (Exception e){
-            OAuthServer.logger.log(Level.ERROR, e.toString());
+            OAuthServer.logger.log(Level.DEBUG, e.toString());
         }
     }
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws IOException {
         disconnect(ctx, "§cInternal server exception");
-        OAuthServer.logger.log(Level.ERROR, cause.toString());
+        OAuthServer.logger.log(Level.DEBUG, cause.toString());
     }
 
     @Override