fix hash order

Signed-off-by: pengzhile <pengzhile@gmail.com>

README.md

@@ -1,20 +1,20 @@
-# Atlassian Agent
+# Atlassian Agent v1.3.1
 
-#### Support (almost any version):
+#### Support (almost any version, include 8.0):
-* JIRA Software
+* JIRA Software [FAQ](doc/JIRA_FAQ.md)
 * JIRA Core
 * JIRA Service Desk
 * JIRA plugin: Capture
 * JIRA plugin: Training
 * JIRA plugin: Portfolio
-* Confluence
+* Confluence [Windows特别注意](doc/Confluence_FAQ.md)
 * Confluence plugin: Questions
 * Confluence plugin: Team Calendars
-* Bamboo
+* Bamboo [FAQ](doc/Bamboo_FAQ.md)
-* Bitbucket
+* Bitbucket [FAQ](doc/Bitbucket_FAQ.md)
-* FishEye
+* FishEye [FAQ](doc/FishEye_Crucible_FAQ.md)
-* Crowd
+* Crowd [FAQ](doc/Crowd_FAQ.md)
-* Crucible
+* Crucible [FAQ](doc/FishEye_Crucible_FAQ.md)
 * Third party plugins
 
 ## 使用说明
@@ -27,7 +27,7 @@
 * 开源项目，你知道破解时都做了什么。
 
 ### 直接下载
-* 直接下载本项目release包。
+* 直接下载本项目[release](https://gitee.com/pengzhile/atlassian-agent/releases)包。
 
 ### 自行编译
 * Clone本项目源码，pom.xml同级目录执行`mvn package`后即可进行编译。
@@ -35,6 +35,7 @@
 * *如果你不知道我在说什么，最好还是直接下载我编译好的包。*
 
 ### 使用帮助
+* 破解需要成套使用，不能只破解插件，要先使用`atlassian-agent.jar`破解服务。
 * 如果你已经获得`atlassian-agent.jar`，可以试着执行`java -jar atlassian-agent.jar`看看输出的帮助。
 * 这里的帮助以Atlassian家的Confluence服务为例。
 
@@ -54,8 +55,8 @@
 ### 使用KeyGen
 * 你得确认已经配置好agent，参考上面说明。
 * 当你试着执行`java -jar /path/to/atlassian-agent.jar`时应该可以看到输出的KeyGen参数帮助。
-* 请仔细看看每个参数的作用，特别是`-p`参数的取值范围。
+* 请仔细看看每个参数的作用，特别是`-p`参数的取值范围。`-p`参数内容最好用引号包住，否则可能影响参数解析。
-* 第三方插件将其`应用密钥`作为`-p`参数。如：`-p com.gliffy.integration.confluence`
+* 第三方插件将其`应用密钥/插件关键字`作为`-p`参数。如：`-p 'com.gliffy.integration.confluence'`
 * 在Atlassian服务安装时你应该能看到类似：`AAAA-BBBB-CCCC-DDDD`的server id，请留意。
 * 提供了正确的参数运行KeyGen会在终端输出计算好的激活码。
 * 将生成的激活码复制出来去激活你要使用的服务。
@@ -71,4 +72,11 @@
 * 给本项目发issue。
 * 欢迎你来一起完善这个项目，请发PR。
 * 你可以加入QQ群：30347511 和我实时交流。
-* 访问网站：[https://zhile.io](https://zhile.io) 给我留言。
+* 访问网站：[https://zhile.io](https://zhile.io) 给我留言。
+
+### 热心网友教程（感谢原作者，侵删！）
+* [热心大佬的一键安装配置脚本](https://github.com/alues/atlassian_install_script)
+* [confluence 安装及破解](https://www.qinjj.tech/2019/01/04/confluence%20install/)
+* [【黑科技】Atlassian产品线全破解](https://tech.cuixiangbin.com/?p=1248)
+* [通过Docker安装JIRA和Confluence（破解版）](https://www.jianshu.com/p/b95ceabd3e9d)
+* [通过Docker安装JIRA和Confluence（破解版）](https://my.oschina.net/wuweixiang/blog/3014644)

doc/Bamboo_FAQ.md

@@ -0,0 +1,15 @@
+# Bamboo FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但Bamboo激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 Bamboo 并没有使用全局设置的这个变量，主要还是依赖的其自身目录中 `安装目录下/bin/setenv.sh` 中的配置，所以编辑这个文件，修改 
+
+`JAVA_OPTS="-Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JVM_REQUIRED_ARGS} ${JVM_SUPPORT_RECOMMENDED_ARGS} ${BAMBOO_HOME_MINUSD}"` 
+
+处为 
+
+`JAVA_OPTS="-javaagent:/atlassian-agent存放目录/atlassian-agent.jar -Xms${JVM_MINIMUM_MEMORY} -Xmx${JVM_MAXIMUM_MEMORY} ${JAVA_OPTS} ${JVM_REQUIRED_ARGS} ${JVM_SUPPORT_RECOMMENDED_ARGS} ${BAMBOO_HOME_MINUSD}"`
+
+再重新尝试激活即可

doc/Bitbucket_FAQ.md

@@ -0,0 +1,15 @@
+# Bitbucket FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但Bitbucket激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 Bitbucket 并没有使用全局设置的这个变量，主要还是依赖的其自身目录中 `安装目录下/bin/_start-webapp.sh` 中的配置，所以编辑这个文件，修改 
+
+`JAVA_OPTS="-classpath $INST_DIR/app $JAVA_OPTS $BITBUCKET_ARGS $JMX_OPTS $JVM_REQUIRED_ARGS $JVM_SUPPORT_RECOMMENDED_ARGS"` 
+
+处为 
+
+`JAVA_OPTS="-javaagent:/atlassian-agent存放目录/atlassian-agent.jar -classpath $INST_DIR/app $JAVA_OPTS $BITBUCKET_ARGS $JMX_OPTS $JVM_REQUIRED_ARGS $JVM_SUPPORT_RECOMMENDED_ARGS"`
+
+再重新尝试激活即可

doc/Confluence_FAQ.md

@@ -0,0 +1,15 @@
+# Confluence FAQ
+
+### Windows下Confluence的激活注意点
+
+* 不要使用start-service.bat启动（如果非要这样启动，自己去注册表改-javaagent参数）
+* 使用bin\start-confluence.bat启动
+* 在bin\setenv.bat里添加-javaagent参数
+* Windows下Confluence有个bug，需要改动setenv.bat修复
+
+ ```bash
+set CATALINA_OPTS=-Xloggc:"%atlassian_logsdir%\gc-%atlassian_timestamp%.log" %CATALINA_OPTS%
+//改成
+set CATALINA_OPTS=-Xloggc:"%atlassian_logsdir%\gc-%%t.log" %CATALINA_OPTS%
+```
+

doc/Crowd_FAQ.md

@@ -0,0 +1,7 @@
+# Crowd FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但Crowd激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 Crowd 并没有使用全局设置的这个变量，主要还是依赖的其自身目录中 `安装目录下/apache-tomcat/bin/setenv.sh` 中的配置，所以编辑这个文件，加上 `JAVA_OPTS="-javaagent:/atlassian-agent存放目录/atlassian-agent.jar $JAVA_OPTS"`，再重新尝试激活即可

doc/FishEye_Crucible_FAQ.md

@@ -0,0 +1,17 @@
+# FishEye & Crucible FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但 FishEye or Crucible 激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 FishEye 和 Crucible 没有直接使用这个环境变量，使用的是 `FISHEYE_OPTS` 这一环境变量
+
+所以我们打开bin目录中的fisheyectl.sh文件，将其中的
+
+```FISHEYE_CMD="$JAVACMD $FISHEYE_OPTS -Dfisheye.library.path=$FISHEYE_LIBRARY_PATH -Dfisheye.inst=$FISHEYE_INST -Djava.awt.headless=true -Djava.endorsed.dirs=$FISHEYE_HOME/lib/endorsed -jar $FISHEYE_HOME/fisheyeboot.jar"```
+
+添加成
+
+```FISHEYE_CMD="$JAVACMD $FISHEYE_OPTS -javaagent:/path/to/atlassian-agent-v1.2.2/atlassian-agent.jar -Dfisheye.library.path=$FISHEYE_LIBRARY_PATH -Dfisheye.inst=$FISHEYE_INST -Djava.awt.headless=true -Djava.endorsed.dirs=$FISHEYE_HOME/lib/endorsed -jar $FISHEYE_HOME/fisheyeboot.jar"```
+
+再重新尝试激活即可。

doc/JIRA_FAQ.md

@@ -0,0 +1,7 @@
+# JIRA FAQ
+
+### 明明按照文档中说的配置了agent，并且成功激活了confluence，但JIRA激活时提示生成的密钥无效
+这种情况往往是 `JAVA_OPTS` 设置的问题，如果是按照下边方式设置的 `JAVA_OPTS` ，会出现激活失败
+   * 你可以把：`export JAVA_OPTS="-javaagent:/path/to/atlassian-agent.jar ${JAVA_OPTS}"` 这样的命令放到 `.bashrc` 或 `.bash_profile` 这样的文件内。
+
+原因即是 JIRA 并没有使用全局设置的这个变量，主要还是依赖的其自身目录中 `安装目录下/bin/setenv.sh` 中的配置，所以编辑这个文件，加上 `JAVA_OPTS="-javaagent:/atlassian-agent存放目录/atlassian-agent.jar $JAVA_OPTS"` 在 `JAVA_OPTS` 处，再重新尝试激活即可

pom.xml

@@ -20,8 +20,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.7.0</version>
                 <configuration>
-                    <source>7</source>
+                    <source>1.7</source>
-                    <target>7</target>
+                    <target>1.7</target>
                     <encoding>UTF-8</encoding>
                 </configuration>
             </plugin>
@@ -72,6 +72,11 @@
             <artifactId>commons-cli</artifactId>
             <version>1.4</version>
         </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
+        </dependency>
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>

src/main/java/io/zhile/crack/atlassian/Usage.java

@@ -14,6 +14,7 @@ import java.util.Map;
  * @link https://zhile.io
  */
 public class Usage {
+    private static final String VERSION = "v1.3.1";
     private static final Options OPTIONS = new Options();
     private static final Map<String, String> PRODUCTS = new HashMap<>(16);
     private static final String PRODUCTS_DESC;
@@ -31,6 +32,7 @@ public class Usage {
         PRODUCTS.put("jc", "JIRA Core");
         PRODUCTS.put("portfolio", "Portfolio plugin for JIRA");
         PRODUCTS.put("jsd", "JIRA Service Desk");
+        PRODUCTS.put("jsm", "JIRA Service Management");
         PRODUCTS.put("training", "Training plugin for JIRA");
         PRODUCTS.put("capture", "Capture plugin for JIRA");
         PRODUCTS.put("*", "Third party plugin key, looks like: com.foo.bar");
@@ -49,7 +51,7 @@ public class Usage {
 
     public static void main(String[] args) {
         String usage = "\n====================================================\n" +
-                "=======        Atlassian Crack Agent         =======\n" +
+                "=======     Atlassian Crack Agent " + VERSION + "     =======\n" +
                 "=======           https://zhile.io           =======\n" +
                 "=======          QQ Group: 30347511          =======\n" +
                 "====================================================\n\n";
@@ -120,37 +122,38 @@ public class Usage {
                 property = new TeamCalendars(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "bamboo":
-                property = new Bamboo(contactName, contactEMail, serverID, organisation);
+                property = new Bamboo(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "bitbucket":
                 property = new Bitbucket(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "fisheye":
-                property = new FishEye(contactName, contactEMail, serverID, organisation);
+                property = new FishEye(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "crucible":
-                property = new Crucible(contactName, contactEMail, serverID, organisation);
+                property = new Crucible(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "crowd":
                 property = new Crowd(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "jc":
-                property = new JIRACore(contactName, contactEMail, serverID, organisation);
+                property = new JIRACore(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "portfolio":
                 property = new Portfolio(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "jsd":
+            case "jsm":
                 property = new JIRAServiceDesk(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "training":
-                property = new Training(contactName, contactEMail, serverID, organisation);
+                property = new Training(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             case "capture":
-                property = new Capture(contactName, contactEMail, serverID, organisation);
+                property = new Capture(contactName, contactEMail, serverID, organisation, dataCenter);
                 break;
             default:
-                property = new ThirdPlugin(contactName, contactEMail, serverID, organisation);
+                property = new ThirdPlugin(contactName, contactEMail, serverID, organisation, dataCenter);
                 ((ThirdPlugin) property).setProductName(product);
                 break;
         }

src/main/java/io/zhile/crack/atlassian/agent/Agent.java

@@ -4,8 +4,8 @@ import java.lang.instrument.Instrumentation;
 
 /**
  * @author pengzhile
- * @link https://zhile.io
  * @version 1.0
+ * @link https://zhile.io
  */
 public class Agent {
     public static void premain(String args, Instrumentation inst) {

src/main/java/io/zhile/crack/atlassian/agent/KeyTransformer.java

@@ -1,6 +1,9 @@
 package io.zhile.crack.atlassian.agent;
 
-import javassist.*;
+import javassist.ClassPool;
+import javassist.CtClass;
+import javassist.CtConstructor;
+import javassist.CtField;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
@@ -8,8 +11,8 @@ import java.security.ProtectionDomain;
 
 /**
  * @author pengzhile
- * @link https://zhile.io
  * @version 1.0
+ * @link https://zhile.io
  */
 public class KeyTransformer implements ClassFileTransformer {
     private static final String CN_KEY_SPEC = "java/security/spec/EncodedKeySpec";
@@ -29,21 +32,29 @@ public class KeyTransformer implements ClassFileTransformer {
 
     private byte[] handleKeySpec() throws IllegalClassFormatException {
         try {
+            String b64f;
             ClassPool cp = ClassPool.getDefault();
-            cp.importPackage("java.util.Arrays");
-            cp.importPackage("javax.xml.bind.DatatypeConverter");
-
-            int mod = Modifier.PRIVATE | Modifier.STATIC | Modifier.FINAL;
             CtClass cc = cp.get(CN_KEY_SPEC.replace('/', '.'));
-            CtClass cb = cp.get("byte[]");
+
-            CtField cfOld = new CtField(cb, "__h_ok", cc);
+            cp.importPackage("java.util.Arrays");
-            CtField cfNew = new CtField(cb, "__h_nk", cc);
+            try {
-            cfOld.setModifiers(mod);
+                Class.forName("java.util.Base64");
-            cfNew.setModifiers(mod);
+                cp.importPackage("java.util.Base64");
-            cc.addField(cfOld, "DatatypeConverter.parseBase64Binary(\"MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAIvfweZvmGo5otwawI3no7Udanxal3hX2haw962KL/nHQrnC4FG2PvUFf34OecSK1KtHDPQoSQ+DHrfdf6vKUJphw0Kn3gXm4LS8VK/LrY7on/wh2iUobS2XlhuIqEc5mLAUu9Hd+1qxsQkQ50d0lzKrnDqPsM0WA9htkdJJw2nS\");");
+                b64f = "Base64.getDecoder().decode";
-            cc.addField(cfNew, "DatatypeConverter.parseBase64Binary(\"MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAO0DidNibJHhtgxAnM9NszURYU25CVLAlwFdOWhiUkjrjOY459ObRZDVd35hQmN/cCLkDox7y2InJE6PDWfbx9BsgPmPvH75yKgPs3B8pClQVkgIpJp08R59hoZabYuvm7mxCyDGTl2lbrOi0a3j4vM5OoCWKQjIEZ28OpjTyCr3\");");
+            } catch (ClassNotFoundException e) {
+                try {
+                    Class.forName("javax.xml.bind.DatatypeConverter");
+                    cp.importPackage("javax.xml.bind.DatatypeConverter");
+                    b64f = "DatatypeConverter.parseBase64Binary";
+                } catch (ClassNotFoundException e1) {
+                    throw new RuntimeException(e1);
+                }
+            }
+            cc.addField(CtField.make("private static final byte[] __h_ok1=" + b64f + "(\"MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAIvfweZvmGo5otwawI3no7Udanxal3hX2haw962KL/nHQrnC4FG2PvUFf34OecSK1KtHDPQoSQ+DHrfdf6vKUJphw0Kn3gXm4LS8VK/LrY7on/wh2iUobS2XlhuIqEc5mLAUu9Hd+1qxsQkQ50d0lzKrnDqPsM0WA9htkdJJw2nS\");", cc));
+            cc.addField(CtField.make("private static final byte[] __h_ok2=" + b64f + "(\"MIIBtzCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYQAAoGALZHuJwQzgGnYm/X9BkMcewYQnWjMIGWHd9Yom5Qw7cVIdiZkqpiSzSKurO/WAHHLN31obg7NgGkitWUysECRE3zuJVbKGhx9xjVMnP6z5SwI89vB7Gn7UWxoCvT0JZgcMyQobXeVBtM9J3EgzkdDx/+Dck7uz/l1y+HDNdRzW00=\");", cc));
+            cc.addField(CtField.make("private static final byte[] __h_nk=" + b64f + "(\"MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAO0DidNibJHhtgxAnM9NszURYU25CVLAlwFdOWhiUkjrjOY459ObRZDVd35hQmN/cCLkDox7y2InJE6PDWfbx9BsgPmPvH75yKgPs3B8pClQVkgIpJp08R59hoZabYuvm7mxCyDGTl2lbrOi0a3j4vM5OoCWKQjIEZ28OpjTyCr3\");", cc));
             CtConstructor cm = cc.getConstructor("([B)V");
-            cm.insertBeforeBody("if(Arrays.equals($1,__h_ok)){$1=__h_nk;System.out.println(\"============================== agent working ==============================\");}");
+            cm.insertBefore("if(Arrays.equals($1,__h_ok1)||Arrays.equals($1,__h_ok2)){$1=__h_nk;System.out.println(\"============================== agent working ==============================\");}");
 
             return cc.toBytecode();
         } catch (Exception e) {

src/main/java/io/zhile/crack/atlassian/keygen/Encoder.java

@@ -6,7 +6,10 @@ import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.security.*;
+import java.security.KeyFactory;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Signature;
 import java.security.spec.EncodedKeySpec;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
@@ -32,7 +35,7 @@ public class Encoder {
         }
     }
 
-    public static String encode(String licenseText) throws IOException, NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+    public static String encode(String licenseText) throws Exception {
         byte[] licenseData = zipText(licenseText.getBytes());
         byte[] text = new byte[licenseData.length + 5];
         text[0] = 13;   // license prefix
@@ -42,11 +45,15 @@ public class Encoder {
         text[4] = 15;
         System.arraycopy(licenseData, 0, text, 5, licenseData.length);
 
+        return packLicense(text, sign(text));
+    }
+
+    public static byte[] sign(byte[] bytes) throws Exception {
         Signature signature = Signature.getInstance("SHA1withDSA");
         signature.initSign(PRIVATE_KEY);
-        signature.update(text);
+        signature.update(bytes);
 
-        return packLicense(text, signature.sign());
+        return signature.sign();
     }
 
     private static byte[] zipText(byte[] licenseText) throws IOException {

src/main/java/io/zhile/crack/atlassian/license/LicenseEdition.java

@@ -2,8 +2,8 @@ package io.zhile.crack.atlassian.license;
 
 /**
  * @author pengzhile
- * @link https://zhile.io
  * @version 1.0
+ * @link https://zhile.io
  */
 public enum LicenseEdition {
     BASIC,

src/main/java/io/zhile/crack/atlassian/license/LicenseProperty.java

@@ -1,9 +1,14 @@
 package io.zhile.crack.atlassian.license;
 
+import io.zhile.crack.atlassian.keygen.Encoder;
+import io.zhile.crack.atlassian.utils.Base64;
+
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeSet;
 
 /**
  * @author pengzhile
@@ -30,10 +35,6 @@ abstract public class LicenseProperty {
         this.dataCenter = dataCenter;
     }
 
-    public LicenseProperty(String contactName, String contactEMail, String serverID, String organisation) {
-        this(contactName, contactEMail, serverID, organisation, false);
-    }
-
     public void init() {
         Date expiryDate = new Date(3771590399000L);
         String licenseId = "L" + System.currentTimeMillis();
@@ -57,7 +58,8 @@ abstract public class LicenseProperty {
         setOrganisation(organisation);
         setDataCenter(dataCenter);
 
-        data.put("licenseVersion", "2");
+        setLicenseVersion("2");
+        setKeyVersion("1600708331");
     }
 
     public void setDescription(String description) {
@@ -124,6 +126,14 @@ abstract public class LicenseProperty {
         data.put("PurchaseDate", new SimpleDateFormat("yyyy-MM-dd").format(purchaseDate));
     }
 
+    public void setLicenseVersion(String version) {
+        data.put("licenseVersion", version);
+    }
+
+    public void setKeyVersion(String version) {
+        data.put("keyVersion", version);
+    }
+
     public void setDataCenter(boolean dataCenter) {
         if (dataCenter) {
             data.put(productProperty("DataCenter"), "true");
@@ -138,11 +148,74 @@ abstract public class LicenseProperty {
         return getProductName() + "." + property;
     }
 
+    protected void setLicenseHash() {
+        data.remove("licenseHash");
+
+        StringBuilder sb = new StringBuilder();
+        for (String key : new TreeSet<>(data.keySet())) {
+            String val = data.get(key);
+            if (val == null) {
+                continue;
+            }
+
+            sb.append(escape(key, true)).append("=").append(escape(val, false)).append("\n");
+        }
+
+        try {
+            data.put("licenseHash", Base64.encode(Encoder.sign(sb.toString().getBytes(StandardCharsets.UTF_8))));
+        } catch (Exception e) {
+            // never
+        }
+    }
+
+    protected String escape(String str, boolean isKey) {
+        int len = str.length();
+        StringBuilder sb = new StringBuilder(len * 2);
+
+        for (int index = 0; index < len; ++index) {
+            char c = str.charAt(index);
+            switch (c) {
+                case '\t':
+                    sb.append("\\t");
+                    break;
+                case '\n':
+                    sb.append("\\n");
+                    break;
+                case '\f':
+                    sb.append("\\f");
+                    break;
+                case '\r':
+                    sb.append("\\r");
+                    break;
+                case ' ':
+                    if (index == 0 || isKey) {
+                        sb.append('\\');
+                    }
+
+                    sb.append(' ');
+                    break;
+                case '\\':
+                    sb.append("\\\\");
+                    break;
+                default:
+                    if ("=: \t\r\n\f#!".indexOf(c) != -1) {
+                        sb.append('\\');
+                    }
+
+                    sb.append(c);
+                    break;
+            }
+        }
+
+        return sb.toString();
+    }
+
     @Override
     public final String toString() {
         StringBuilder sb = new StringBuilder("#");
         sb.append(date.toString());
 
+        setLicenseHash();
         for (Map.Entry<String, String> entry : data.entrySet()) {
             if (entry.getValue() == null) {
                 continue;

src/main/java/io/zhile/crack/atlassian/license/LicenseType.java

@@ -2,8 +2,8 @@ package io.zhile.crack.atlassian.license;
 
 /**
  * @author pengzhile
- * @link https://zhile.io
  * @version 1.0
+ * @link https://zhile.io
  */
 public enum LicenseType {
     ACADEMIC,

src/main/java/io/zhile/crack/atlassian/license/products/Bamboo.java

@@ -9,8 +9,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty;
  * @link https://zhile.io
  */
 public class Bamboo extends LicenseProperty {
-    public Bamboo(String contactName, String contactEMail, String serverID, String organisation) {
+    public Bamboo(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override
@@ -30,7 +30,7 @@ public class Bamboo extends LicenseProperty {
 
     @Override
     public void setNumberOfUsers(int numberOfUsers) {
-        //
+        // disabled
     }
 
     public void setLicenseEdition(LicenseEdition licenseEdition) {

src/main/java/io/zhile/crack/atlassian/license/products/Bitbucket.java

@@ -12,10 +12,6 @@ public class Bitbucket extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Bitbucket(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "stash";

src/main/java/io/zhile/crack/atlassian/license/products/Capture.java

@@ -6,8 +6,8 @@ package io.zhile.crack.atlassian.license.products;
  * @link https://zhile.io
  */
 public class Capture extends ThirdPlugin {
-    public Capture(String contactName, String contactEMail, String serverID, String organisation) {
+    public Capture(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
 
         setProductName("bonfire");
     }

src/main/java/io/zhile/crack/atlassian/license/products/Confluence.java

@@ -12,10 +12,6 @@ public class Confluence extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Confluence(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "conf";

src/main/java/io/zhile/crack/atlassian/license/products/Crowd.java

@@ -12,10 +12,6 @@ public class Crowd extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Crowd(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "crowd";

src/main/java/io/zhile/crack/atlassian/license/products/Crucible.java

@@ -8,8 +8,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty;
  * @link https://zhile.io
  */
 public class Crucible extends LicenseProperty {
-    public Crucible(String contactName, String contactEMail, String serverID, String organisation) {
+    public Crucible(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override

src/main/java/io/zhile/crack/atlassian/license/products/FishEye.java

@@ -8,8 +8,8 @@ import io.zhile.crack.atlassian.license.LicenseProperty;
  * @link https://zhile.io
  */
 public class FishEye extends LicenseProperty {
-    public FishEye(String contactName, String contactEMail, String serverID, String organisation) {
+    public FishEye(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override

src/main/java/io/zhile/crack/atlassian/license/products/JIRACore.java

@@ -10,8 +10,8 @@ import io.zhile.crack.atlassian.license.LicenseType;
  * @link https://zhile.io
  */
 public class JIRACore extends LicenseProperty {
-    public JIRACore(String contactName, String contactEMail, String serverID, String organisation) {
+    public JIRACore(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override

src/main/java/io/zhile/crack/atlassian/license/products/JIRAServiceDesk.java

@@ -13,10 +13,6 @@ public class JIRAServiceDesk extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public JIRAServiceDesk(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public void init() {
         super.init();

src/main/java/io/zhile/crack/atlassian/license/products/JIRASoftware.java

@@ -14,10 +14,6 @@ public class JIRASoftware extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public JIRASoftware(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public void init() {
         super.init();

src/main/java/io/zhile/crack/atlassian/license/products/Plugin.java

@@ -12,10 +12,6 @@ abstract public class Plugin extends LicenseProperty {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Plugin(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public void init() {
         super.init();

src/main/java/io/zhile/crack/atlassian/license/products/Portfolio.java

@@ -10,10 +10,6 @@ public class Portfolio extends Plugin {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Portfolio(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "com.radiantminds.roadmaps-jira";

src/main/java/io/zhile/crack/atlassian/license/products/Questions.java

@@ -10,10 +10,6 @@ public class Questions extends Plugin {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public Questions(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "com.atlassian.confluence.plugins.confluence-questions";

src/main/java/io/zhile/crack/atlassian/license/products/TeamCalendars.java

@@ -10,10 +10,6 @@ public class TeamCalendars extends Plugin {
         super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
-    public TeamCalendars(String contactName, String contactEMail, String serverID, String organisation) {
-        super(contactName, contactEMail, serverID, organisation);
-    }
-
     @Override
     public String getProductName() {
         return "team_calendars";

src/main/java/io/zhile/crack/atlassian/license/products/ThirdPlugin.java

@@ -10,8 +10,8 @@ import io.zhile.crack.atlassian.license.LicenseType;
 public class ThirdPlugin extends Plugin {
     protected String productName;
 
-    public ThirdPlugin(String contactName, String contactEMail, String serverID, String organisation) {
+    public ThirdPlugin(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override

src/main/java/io/zhile/crack/atlassian/license/products/Training.java

@@ -6,8 +6,8 @@ package io.zhile.crack.atlassian.license.products;
  * @link https://zhile.io
  */
 public class Training extends Plugin {
-    public Training(String contactName, String contactEMail, String serverID, String organisation) {
+    public Training(String contactName, String contactEMail, String serverID, String organisation, boolean dataCenter) {
-        super(contactName, contactEMail, serverID, organisation);
+        super(contactName, contactEMail, serverID, organisation, dataCenter);
     }
 
     @Override

src/main/java/io/zhile/crack/atlassian/utils/Base64.java

@@ -4,8 +4,8 @@ import javax.xml.bind.DatatypeConverter;
 
 /**
  * @author pengzhile
- * @link https://zhile.io
  * @version 1.0
+ * @link https://zhile.io
  */
 public class Base64 {
     public static byte[] decode(String val) {

src/main/java/io/zhile/crack/atlassian/utils/DSA.java

@@ -1,21 +0,0 @@
-package io.zhile.crack.atlassian.utils;
-
-import java.security.*;
-
-/**
- * @author pengzhile
- * @link https://zhile.io
- * @version 1.0
- */
-public class DSA {
-    public static void genKeyPair() throws NoSuchAlgorithmException {
-        KeyPairGenerator dsa = KeyPairGenerator.getInstance("DSA");
-        SecureRandom random = new SecureRandom();
-        dsa.initialize(1024, random);
-        KeyPair keypair = dsa.generateKeyPair();
-        PrivateKey privateKey = keypair.getPrivate();
-        PublicKey publicKey = keypair.getPublic();
-        System.out.println(Base64.encode(privateKey.getEncoded()));
-        System.out.println(Base64.encode(publicKey.getEncoded()));
-    }
-}

src/main/resources/dsa_private.pem

@@ -1,7 +0,0 @@
-MIIBSwIBADCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdS
-PO9EAMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVCl
-pJ+f6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith
-1yrv8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7L
-vKtcNrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3
-zwkyjMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImo
-g9/hWuWfBpKLZl6Ae1UlZAFMO/7PSSoEFgIUNYsbkapILzW8VhfGrU4eHo6/Dqw=

src/main/resources/dsa_public.pem

@@ -1,10 +0,0 @@
-MIIBuDCCASwGByqGSM44BAEwggEfAoGBAP1/U4EddRIpUt9KnC7s5Of2EbdSPO9E
-AMMeP4C2USZpRV1AIlH7WT2NWPq/xfW6MPbLm1Vs14E7gB00b/JmYLdrmVClpJ+f
-6AR7ECLCT7up1/63xhv4O1fnxqimFQ8E+4P208UewwI1VBNaFpEy9nXzrith1yrv
-8iIDGZ3RSAHHAhUAl2BQjxUjC8yykrmCouuEC/BYHPUCgYEA9+GghdabPd7LvKtc
-NrhXuXmUr7v6OuqC+VdMCz0HgmdRWVeOutRZT+ZxBxCBgLRJFnEj6EwoFhO3zwky
-jMim4TwWeotUfI0o4KOuHiuzpnWRbqN/C/ohNWLx+2J6ASQ7zKTxvqhRkImog9/h
-WuWfBpKLZl6Ae1UlZAFMO/7PSSoDgYUAAoGBAO0DidNibJHhtgxAnM9NszURYU25
-CVLAlwFdOWhiUkjrjOY459ObRZDVd35hQmN/cCLkDox7y2InJE6PDWfbx9BsgPmP
-vH75yKgPs3B8pClQVkgIpJp08R59hoZabYuvm7mxCyDGTl2lbrOi0a3j4vM5OoCW
-KQjIEZ28OpjTyCr3