new package

4ra1n · 4ra1n · commit b7f5f26ed40f · 2023-01-16T14:35:30.000+08:00
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -203,9 +203,13 @@ Others:
 
 ## 1.3
 
-修复安全漏洞：
+重大更新版本：
+- 修复安全漏洞
+- AJP服务扫描面板
+- 新增多个菜单选项
+- 内置六款小游戏
 
-[GHSA-vgxx-2crp-32vv](https://github.com/4ra1n/super-xray/security/advisories/GHSA-vgxx-2crp-32vv)
+修复安全漏洞：[GHSA-vgxx-2crp-32vv 特殊情况下的完全拒绝服务](https://github.com/4ra1n/super-xray/security/advisories/GHSA-vgxx-2crp-32vv)
 
 使用`exe`版本加载`super-xray`自身将会无限启动，导致耗尽操作系统`CPU`和内存。无限启动原因是启动时需要执行之前保存的`xray`路径，如果选择了`super-xray.exe`自身保存后显然会导致死循环。由于用户输入的可执行文件是什么应该由用户负责，一般情况下不应该是安全漏洞，但是用户输入`super-xray`自身导致的问题应该被处理。二进制可执行文件无法判断具体是什么，所以只能限制文件名结合文件大小二者来防止加载自身，但是用户加载其他可执行文件导致的安全问题与本项目无关。
 
diff --git a/src/main/java/com/chaitin/xray/form/MainForm.java b/src/main/java/com/chaitin/xray/form/MainForm.java
@@ -1,15 +1,15 @@
 package com.chaitin.xray.form;
 
 import com.chaitin.xray.Application;
-import com.chaitin.xray.flappy.FBMainFrame;
+import com.chaitin.xray.games.flappy.FBMainFrame;
 import com.chaitin.xray.model.Const;
 import com.chaitin.xray.model.DB;
 import com.chaitin.xray.model.Poc;
 import com.chaitin.xray.model.XrayCmd;
-import com.chaitin.xray.pinball.PinballFrame;
-import com.chaitin.xray.plane.Game;
-import com.chaitin.xray.snake.Main;
-import com.chaitin.xray.sweep.GameFrame;
+import com.chaitin.xray.games.pinball.PinballFrame;
+import com.chaitin.xray.games.plane.Game;
+import com.chaitin.xray.games.snake.Main;
+import com.chaitin.xray.games.sweep.GameFrame;
 import com.chaitin.xray.utils.*;
 import com.formdev.flatlaf.FlatLightLaf;
 import com.intellij.uiDesigner.core.GridConstraints;
@@ -2169,7 +2169,7 @@ private static JMenu createGameMenu() {
             }
             ImageIcon pokerIcon = new ImageIcon(ImageIO.read(is));
             pokerItem.setIcon(pokerIcon);
-            pokerItem.addActionListener(e -> new Thread(com.chaitin.xray.pocker.Main::new).start());
+            pokerItem.addActionListener(e -> new Thread(com.chaitin.xray.games.pocker.Main::new).start());
 
             JMenuItem planeItem = new JMenuItem("雷电");
             is = MainForm.class.getClassLoader().getResourceAsStream(
diff --git a/src/main/java/com/chaitin/xray/games/flappy/Bird.java b/src/main/java/com/chaitin/xray/games/flappy/Bird.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Element;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/FBImgIcon.java b/src/main/java/com/chaitin/xray/games/flappy/FBImgIcon.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/chaitin/xray/games/flappy/FBListener.java b/src/main/java/com/chaitin/xray/games/flappy/FBListener.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import java.awt.*;
 import java.awt.event.MouseEvent;
diff --git a/src/main/java/com/chaitin/xray/games/flappy/FBMainFrame.java b/src/main/java/com/chaitin/xray/games/flappy/FBMainFrame.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Element;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/InDrawImage.java b/src/main/java/com/chaitin/xray/games/flappy/InDrawImage.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/InXMLAnalysis.java b/src/main/java/com/chaitin/xray/games/flappy/InXMLAnalysis.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Element;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/Pipe.java b/src/main/java/com/chaitin/xray/games/flappy/Pipe.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Element;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/Score.java b/src/main/java/com/chaitin/xray/games/flappy/Score.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Element;
 
diff --git a/src/main/java/com/chaitin/xray/games/flappy/XMLRoot.java b/src/main/java/com/chaitin/xray/games/flappy/XMLRoot.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.flappy;
+package com.chaitin.xray.games.flappy;
 
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
diff --git a/src/main/java/com/chaitin/xray/games/pinball/Constant.java b/src/main/java/com/chaitin/xray/games/pinball/Constant.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pinball;
+package com.chaitin.xray.games.pinball;
 
 public interface Constant {
     int TABLE_WIDTH = 300;
diff --git a/src/main/java/com/chaitin/xray/games/pinball/GameCanvas.java b/src/main/java/com/chaitin/xray/games/pinball/GameCanvas.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pinball;
+package com.chaitin.xray.games.pinball;
 
 import java.awt.*;
 import java.util.function.Consumer;
diff --git a/src/main/java/com/chaitin/xray/games/pinball/PinballFrame.java b/src/main/java/com/chaitin/xray/games/pinball/PinballFrame.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pinball;
+package com.chaitin.xray.games.pinball;
 
 import javax.swing.*;
 import java.awt.*;
@@ -8,7 +8,7 @@
 import java.awt.event.WindowEvent;
 import java.util.Random;
 
-import static com.chaitin.xray.pinball.Constant.*;
+import static com.chaitin.xray.games.pinball.Constant.*;
 
 public class PinballFrame extends JFrame {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/chaitin/xray/games/plane/Break.java b/src/main/java/com/chaitin/xray/games/plane/Break.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Content.java b/src/main/java/com/chaitin/xray/games/plane/Content.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
diff --git a/src/main/java/com/chaitin/xray/games/plane/Enemybullet.java b/src/main/java/com/chaitin/xray/games/plane/Enemybullet.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import java.awt.image.BufferedImage;
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Enemyplane.java b/src/main/java/com/chaitin/xray/games/plane/Enemyplane.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import java.awt.*;
 import java.awt.image.BufferedImage;
diff --git a/src/main/java/com/chaitin/xray/games/plane/Game.java b/src/main/java/com/chaitin/xray/games/plane/Game.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import javax.swing.*;
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Gameover.java b/src/main/java/com/chaitin/xray/games/plane/Gameover.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import java.awt.image.BufferedImage;
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Home.java b/src/main/java/com/chaitin/xray/games/plane/Home.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
diff --git a/src/main/java/com/chaitin/xray/games/plane/Life.java b/src/main/java/com/chaitin/xray/games/plane/Life.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 public class Life extends Location {
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Location.java b/src/main/java/com/chaitin/xray/games/plane/Location.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import java.awt.*;
 
diff --git a/src/main/java/com/chaitin/xray/games/plane/Mybullet.java b/src/main/java/com/chaitin/xray/games/plane/Mybullet.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 @SuppressWarnings("all")
 public class Mybullet extends Location {
diff --git a/src/main/java/com/chaitin/xray/games/plane/Myplane.java b/src/main/java/com/chaitin/xray/games/plane/Myplane.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 @SuppressWarnings("all")
 public class Myplane extends Location {
diff --git a/src/main/java/com/chaitin/xray/games/plane/PM.java b/src/main/java/com/chaitin/xray/games/plane/PM.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.plane;
+package com.chaitin.xray.games.plane;
 
 import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/Card.java b/src/main/java/com/chaitin/xray/games/pocker/Card.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/CardIndex.java b/src/main/java/com/chaitin/xray/games/pocker/CardIndex.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/CardType.java b/src/main/java/com/chaitin/xray/games/pocker/CardType.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 public enum CardType {
     c0,
diff --git a/src/main/java/com/chaitin/xray/games/pocker/Common.java b/src/main/java/com/chaitin/xray/games/pocker/Common.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import java.awt.*;
 import java.util.Collections;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/Main.java b/src/main/java/com/chaitin/xray/games/pocker/Main.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import javax.imageio.ImageIO;
 import javax.swing.*;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/Model.java b/src/main/java/com/chaitin/xray/games/pocker/Model.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/src/main/java/com/chaitin/xray/games/pocker/Time.java b/src/main/java/com/chaitin/xray/games/pocker/Time.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.pocker;
+package com.chaitin.xray.games.pocker;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/chaitin/xray/games/snake/DataOfSquare.java b/src/main/java/com/chaitin/xray/games/snake/DataOfSquare.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 import java.awt.*;
 import java.util.ArrayList;
diff --git a/src/main/java/com/chaitin/xray/games/snake/KeyboardListener.java b/src/main/java/com/chaitin/xray/games/snake/KeyboardListener.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
diff --git a/src/main/java/com/chaitin/xray/games/snake/Main.java b/src/main/java/com/chaitin/xray/games/snake/Main.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 public class Main {
     public static void start() {
diff --git a/src/main/java/com/chaitin/xray/games/snake/SquarePanel.java b/src/main/java/com/chaitin/xray/games/snake/SquarePanel.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/chaitin/xray/games/snake/ThreadsController.java b/src/main/java/com/chaitin/xray/games/snake/ThreadsController.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 import javax.swing.*;
 import java.util.ArrayList;
diff --git a/src/main/java/com/chaitin/xray/games/snake/Tuple.java b/src/main/java/com/chaitin/xray/games/snake/Tuple.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 public class Tuple {
     public int x;
diff --git a/src/main/java/com/chaitin/xray/games/snake/Window.java b/src/main/java/com/chaitin/xray/games/snake/Window.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.snake;
+package com.chaitin.xray.games.snake;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/chaitin/xray/games/sweep/Constant.java b/src/main/java/com/chaitin/xray/games/sweep/Constant.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.sweep;
+package com.chaitin.xray.games.sweep;
 
 public interface Constant {
     String TITLE = "扫雷";
diff --git a/src/main/java/com/chaitin/xray/games/sweep/GameButton.java b/src/main/java/com/chaitin/xray/games/sweep/GameButton.java
@@ -1,4 +1,4 @@
-package com.chaitin.xray.sweep;
+package com.chaitin.xray.games.sweep;
 
 import javax.swing.*;
 
diff --git a/src/main/java/com/chaitin/xray/games/sweep/GameFrame.java b/src/main/java/com/chaitin/xray/games/sweep/GameFrame.java
@@ -1,10 +1,10 @@
-package com.chaitin.xray.sweep;
+package com.chaitin.xray.games.sweep;
 
 import javax.swing.*;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import static com.chaitin.xray.sweep.Constant.*;
+import static com.chaitin.xray.games.sweep.Constant.*;
 
 public class GameFrame extends JFrame {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/chaitin/xray/games/sweep/GamePanel.java b/src/main/java/com/chaitin/xray/games/sweep/GamePanel.java
@@ -1,11 +1,11 @@
-package com.chaitin.xray.sweep;
+package com.chaitin.xray.games.sweep;
 
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 
-import static com.chaitin.xray.sweep.Constant.*;
+import static com.chaitin.xray.games.sweep.Constant.*;
 
 public class GamePanel extends JPanel {
     private static final long serialVersionUID = 1L;
diff --git a/src/main/resources/super-xray.ico b/src/main/resources/super-xray.ico

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.chaitin.xray.flappy;`
	`1`	`+package com.chaitin.xray.games.flappy;`
`2`	`2`
`3`	`3`	`import org.dom4j.Element;`
`4`	`4`