fix bugs.

#57: add support for linux-x64

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,22 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+ - OS: [e.g. Ubuntu]
+ - Version [e.g. 1.1.2]
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Additional context**
+Add any other context about the problem here.

.github/workflows/manual.yml

@@ -0,0 +1,166 @@
+# This is a basic workflow that is manually triggered
+
+name: Automatic analysis 
+
+# Controls when the action will run. Workflow runs when manually triggered using the UI
+# or API.
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: '23 21 * * 1'
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "greet"
+    check_version:
+      name: check the latest version
+      # The type of runner that the job will run on
+      runs-on: ubuntu-20.04
+      outputs:
+        RELEASE_VERSION: ${{ steps.getLatestRelease.outputs.RELEASE_VERSION }}
+        LATEST_VERSION: ${{ steps.checkVersion.outputs.LATEST_VERSION }}
+      steps:
+        - name: Get Latest Release
+          id: getLatestRelease
+          uses: actions/github-script@v3.1.0
+          with:
+            github-token: ${{secrets.GITHUB_TOKEN}}
+            script: |
+              const releaseResponse = await github.repos.getLatestRelease({
+                owner: 'Mas0nShi',
+                repo: 'typoraCracker',
+              })
+              const {
+                data: { tag_name: ver }
+              } = releaseResponse;
+              core.setOutput('RELEASE_VERSION', ver);
+
+        - uses: actions/checkout@v3
+        - uses: actions/setup-python@v3
+          with:
+            python-version: '3.8' # Version range or exact version of a Python version to use, using SemVer's version range syntax
+            architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
+        - name: install dependencies
+          run: |
+            sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get install innoextract -y
+            python3 -m pip install loguru
+
+        - name: Check Latest Version (use win-x64)
+          id: checkVersion
+          run: | 
+            python3 auto-analysis/check_version.py
+            output="$(cat auto-analysis/win/x64/LATEST_VERSION)"
+            echo "$output"
+            echo "::set-output name=LATEST_VERSION::$output"
+          
+    create_release:
+      needs: check_version
+      runs-on: ubuntu-20.04
+      if: needs.check_version.outputs.RELEASE_VERSION != needs.check_version.outputs.LATEST_VERSION
+
+      steps:
+        - run: echo '${{ needs.check_version.outputs.LATEST_VERSION }}'
+        
+        - name: Create Runner Release
+          uses: actions/create-release@v1
+          id: createRelease
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          with:
+            tag_name: '${{ needs.check_version.outputs.LATEST_VERSION }}'
+            release_name: '${{ needs.check_version.outputs.LATEST_VERSION }}'
+            prerelease: false
+
+          
+    patch_file:
+      needs: [check_version, create_release]
+      runs-on: ubuntu-20.04
+      if: needs.check_version.outputs.RELEASE_VERSION != needs.check_version.outputs.LATEST_VERSION
+
+      steps:
+        - uses: actions/checkout@v3
+        - uses: actions/setup-python@v3
+          with:
+            python-version: '3.8'
+            architecture: 'x64'
+        - name: install dependencies
+          run: |
+            sudo apt-get update && DEBIAN_FRONTEND=noninteractive sudo apt-get install innoextract zip -y
+            python3 -m pip install r2pipe loguru
+        - name: build radare2
+          shell: bash
+          run: |
+            git clone https://github.com/radareorg/radare2
+            radare2/sys/install.sh
+        - name: patch version
+          run: | 
+            python3 auto-analysis/patch.py
+            
+            zip -rjq auto-analysis/win/x64/build/typoraCracker.zip auto-analysis/win/x64/build/*
+            zip -rjq auto-analysis/win/x86/build/typoraCracker.zip auto-analysis/win/x86/build/*
+            zip -rjq auto-analysis/linux/x64/build/typoraCracker.zip auto-analysis/linux/x64/build/*
+            
+        - name: Check release version
+          id: checkReleaseVersion
+          uses: actions/github-script@v3.1.0
+          with:
+            github-token: ${{secrets.GITHUB_TOKEN}}
+            script: |
+              try {
+                const releaseVersion = '${{ needs.check_version.outputs.LATEST_VERSION }}'
+                const releaseResponse = await github.repos.getReleaseByTag({
+                  owner: 'Mas0nShi',
+                  repo: 'typoraCracker',
+                  tag: releaseVersion
+                })
+                const {
+                  data: { id: releaseId, html_url: htmlUrl, upload_url: uploadUrl }
+                } = releaseResponse;
+                core.setOutput('id', releaseId);
+                core.setOutput('html_url', htmlUrl);
+                core.setOutput('upload_url', uploadUrl);
+                core.setOutput('version', releaseVersion);
+              } catch (e) {
+                core.setFailed(e.message);
+              }
+              
+        - name: Upload win-x64
+          uses: actions/upload-release-asset@v1.0.2
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          with:
+            upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+            asset_path: '${{ github.workspace }}/auto-analysis/win/x64/build/typoraCracker.zip'
+            asset_name: 'typoraCracker-${{ needs.check_version.outputs.LATEST_VERSION }}-win-x64.zip'
+            asset_content_type: application/zip
+  
+        - name: Upload win-x86
+          uses: actions/upload-release-asset@v1.0.2
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          with:
+            upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+            asset_path: '${{ github.workspace }}/auto-analysis/win/x86/build/typoraCracker.zip'
+            asset_name: 'typoraCracker-${{ needs.check_version.outputs.LATEST_VERSION }}-win-x86.zip'
+            asset_content_type: application/zip
+
+        - name: Upload linux-x64
+          uses: actions/upload-release-asset@v1.0.2
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          with:
+            upload_url: '${{ steps.checkReleaseVersion.outputs.upload_url }}'
+            asset_path: '${{ github.workspace }}/auto-analysis/linux/x64/build/typoraCracker.zip'
+            asset_name: 'typoraCracker-${{ needs.check_version.outputs.LATEST_VERSION }}-linux-x64.zip'
+            asset_content_type: application/zip
+
+        - name: verify scripts
+          run: |
+            python3 -m pip install -r auto-analysis/win/x64/build/requirements.txt
+            
+            python3 auto-analysis/win/x64/build/typora.py auto-analysis/win/x64/app/resources/app.asar auto-analysis/win/x64
+            echo "win x64 test completed"
+            python3 auto-analysis/win/x86/build/typora.py auto-analysis/win/x86/app/resources/app.asar auto-analysis/win/x86
+            echo "win x86 test completed"
+            python3 auto-analysis/linux/x64/build/typora.py auto-analysis/linux/x64/bin/Typora-linux-x64/resources/app.asar auto-analysis/linux/x64
+            echo "linux x64 test completed"

README.md

@@ -3,10 +3,19 @@
 
 # typora Cracker
 
+![GitHub Repo stars](https://img.shields.io/github/stars/Mas0nshi/typoraCracker)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/Mas0nshi/typoraCracker)
+![GitHub commit activity (branch)](https://img.shields.io/github/commit-activity/m/Mas0nshi/typoraCracker)
+![GitHub Release Date](https://img.shields.io/github/release-date/Mas0nshi/typoraCracker)
+![GitHub issues](https://img.shields.io/github/issues-raw/Mas0nshi/typoraCracker?color=ff69b4)
+![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/Mas0nshi/typoraCracker)
+
+
 ![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2FMas0nShi%2FtyporaCracker.svg?type=shield)
 ![GitHub](https://img.shields.io/github/license/Mas0nShi/typoraCracker)
 [![Automatic analysis](https://github.com/Mas0nShi/typoraCracker/actions/workflows/manual.yml/badge.svg)](https://github.com/Mas0nShi/typoraCracker/actions/workflows/manual.yml)
 
+
 A extract & decryption and pack & encryption tools for typora.
 
 中文说明请戳[这里](README_CN.md)
@@ -30,7 +39,7 @@ ANY PROBLEMS ARISING FROM THIS WILL BE BORNE BY THE USER (YOU).
 | OS / ARCH | x86 | x64 | arm64 |
 |:---------:|:---:|:---:|:-----:|
 |    win    |  ✅  |  ✅  |   ❌   |
-|   linux   |  ❌  |  ❌  |   ❌   |
+|   linux   |  ⛔  |  ✅  |   ❌   |
 |   macOS   |  ❌  |  ❌  |   ❌   |
 
 

README_CN.md

@@ -25,7 +25,7 @@
 | OS / ARCH | x86 | x64 | arm64 |
 |:---------:|:---:|:---:|:-----:|
 |    win    |  ✅  |  ✅  |   ❌   |
-|   linux   |  ❌  |  ❌  |   ❌   |
+|   linux   |  ⛔  |  ✅  |   ❌   |
 |   macOS   |  ❌  |  ❌  |   ❌   |
 
 

auto-analysis/config.py

@@ -17,4 +17,9 @@ DOWNLOAD_LINK = {
         "x64": "https://download.typora.io/linux/Typora-linux-x64.tar.gz",
         "arm64": "https://download.typora.io/linux/Typora-linux-arm64.tar.gz",
     },
+}
+
+EXTRACT_ROOT_PATH = {
+    "win": "app",
+    "linux": "bin/Typora-linux-x64"
 }

auto-analysis/utils.py

@@ -6,12 +6,11 @@
 @Desc: It's all about getting better.
 """
 from loguru import logger as log
-from config import DOWNLOAD_LINK
+from config import DOWNLOAD_LINK, EXTRACT_ROOT_PATH
 import subprocess
 import json
 import os
 
-
 BASE_DIR = os.path.dirname(__file__)
 
 
@@ -23,11 +22,14 @@ def get_version(to_path):
 
 
 def download_file(from_link, to_path):
-    subprocess.check_call(["wget", from_link, "-O", to_path])
+    subprocess.check_call(["wget", "-q", from_link, "-O", to_path])
 
 
 def extract_file(from_path, to_path):
-    subprocess.check_call(["innoextract", from_path, "-d", to_path])
+    if from_path.endswith(".exe"):
+        subprocess.check_call(["innoextract", "-q", from_path, "-d", to_path])
+    elif from_path.endswith(".tar.gz"):
+        subprocess.check_call(["tar", "-zxvf", from_path, "-C", to_path])
 
 
 def patch_file(_key, _iv, to_dir):
@@ -44,8 +46,7 @@ def patch_file(_key, _iv, to_dir):
     open(patch_file_path, "w").write(content)
 
 
-def scheduler(func, basedir, link):
+def scheduler(func, basedir, link, root_path):
-
     download_path = os.path.join(basedir, os.path.basename(link))
     log.info(f"downloading from {link}")
     download_file(link, download_path)
@@ -53,7 +54,8 @@ def scheduler(func, basedir, link):
 
     extract_file(download_path, basedir)
     log.info("preparation stage completed")
-    main_node_path = os.path.join(basedir, "app/resources/app.asar.unpacked/main.node")
+
+    main_node_path = os.path.join(basedir, os.path.join(root_path, "resources/app.asar.unpacked/main.node"))
     log.info("auto analysis start")
     key, iv = func.get_aes_key_and_iv(main_node_path)
     log.success("analysis done")
@@ -66,21 +68,21 @@ def win_x64_run():
     from win.x64 import analysis
     dirs = os.path.join(BASE_DIR, "win/x64")
     url = DOWNLOAD_LINK["win"]["x64"]
-    scheduler(func=analysis, basedir=dirs, link=url)
+    scheduler(func=analysis, basedir=dirs, link=url, root_path=EXTRACT_ROOT_PATH["win"])
 
 
 def win_x86_run():
     from win.x86 import analysis
     dirs = os.path.join(BASE_DIR, "win/x86")
     url = DOWNLOAD_LINK["win"]["x86"]
-    scheduler(func=analysis, basedir=dirs, link=url)
+    scheduler(func=analysis, basedir=dirs, link=url, root_path=EXTRACT_ROOT_PATH["win"])
 
 
 def linux_x64_run():
     from linux.x64 import analysis
     dirs = os.path.join(BASE_DIR, "linux/x64")
     url = DOWNLOAD_LINK["linux"]["x64"]
-    scheduler(func=analysis, basedir=dirs, link=url)
+    scheduler(func=analysis, basedir=dirs, link=url, root_path=EXTRACT_ROOT_PATH["linux"])
 
 
 if __name__ == '__main__':