ensec-cli 1.0.11__tar.gz → 2.1.0__tar.gz

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.11
+Version: 2.1.0
 Summary: EncryptSecureDEC Open Source CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pycryptodome
 Requires-Dist: cryptography
+Requires-Dist: reedsolo
 Dynamic: license-file
 
 # ENSEC-CLI

ensec_cli-2.1.0/ensec_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "2.1.0"

ensec_cli-2.1.0/ensec_cli/bin_ext.py

@@ -0,0 +1,275 @@
+import os
+import json
+import struct
+import configparser
+import hashlib
+
+
+# ======================================================
+# SHA256
+# ======================================================
+def calc_sha256(data: bytes) -> str:
+    return hashlib.sha256(data).hexdigest()
+
+
+# ======================================================
+# 設定ファイルパス生成
+# ======================================================
+from pathlib import Path
+import os
+
+APP_NAME = "ENSEC"
+
+def _default_db_path() -> Path:
+    if os.name == "nt":
+        home = Path.home()
+        base = home / ".local" / "share" / APP_NAME
+    else:
+        xdg_data_home = Path(
+            os.getenv(
+                "XDG_DATA_HOME",
+                Path.home() / ".local" / "share"
+            )
+        )
+        base = xdg_data_home / APP_NAME
+
+    base.mkdir(parents=True, exist_ok=True)
+
+    return base / "split_config.ini"
+
+def init_split_config():
+    """
+    split_config.ini が存在しない場合だけ、
+    デフォルト（基本無効）の設定ファイルを生成する。
+    既存ファイルがある場合は絶対に上書きしない。
+    """
+    config_path = _default_db_path()
+
+    if os.path.exists(config_path):
+        return
+
+    config = configparser.ConfigParser()
+
+    config["Split"] = {
+        "enabled": "false",   # 基本無効
+        "mode": "half",
+        "parts": "2",
+        "delmode": "false"
+    }
+
+    with open(config_path, "w", encoding="utf-8") as f:
+        config.write(f)
+
+
+
+def _load_split_settings() -> dict:
+
+    settings = {
+        "mode": "count",
+        "parts": 4
+    }
+
+    if settings["parts"] < 1:
+        settings["parts"] = 1
+
+    return settings
+
+
+# ======================================================
+# chunk_size 自動判定
+# ======================================================
+def auto_chunk_size(file_size):
+    MB = 1024 * 1024
+    if file_size < 10 * MB:
+        return None
+    elif file_size < 100 * MB:
+        return 5 * MB
+    elif file_size < 500 * MB:
+        return 10 * MB
+    elif file_size < 1024 * MB:
+        return 20 * MB
+    else:
+        return 50 * MB
+
+
+HEADER_SIZE_LEN = 4
+
+
+# ======================================================
+# ヘッダー付きパート書き込み（署名付き）
+# ======================================================
+def _write_part(path, part_index, total_parts, original_name, data):
+    header = {
+        "original_name": original_name,
+        "part_index": part_index,
+        "total_parts": total_parts,
+        "chunk_size": len(data),
+        "sha256": calc_sha256(data)
+    }
+
+    header_raw = json.dumps(header).encode("utf-8")
+    header_size = struct.pack(">I", len(header_raw))
+
+    with open(path, "wb") as f:
+        f.write(header_size)
+        f.write(header_raw)
+        f.write(data)
+
+
+# ======================================================
+# 分割（完全自動制御）
+# ======================================================
+def split_file_with_header(file_path):
+    sett = _load_split_settings()
+
+    #if not enable:
+    #    return None
+
+    mode = sett["mode"]
+    parts = sett["parts"]
+
+    total_size = os.path.getsize(file_path)
+    original_name = os.path.basename(file_path)
+
+    if mode == "half":
+        total_parts = 2
+        half = total_size // 2
+        chunk_sizes = [half, total_size - half]
+
+    else:
+        total_parts = parts
+        base = total_size // parts
+        remainder = total_size % parts
+        chunk_sizes = [base] * parts
+        chunk_sizes[-1] += remainder
+
+    out_paths = []
+
+    with open(file_path, "rb") as fin:
+        for i in range(total_parts):
+            data = fin.read(chunk_sizes[i])
+            part_path = f"{file_path}{i}"
+
+            _write_part(
+                path=part_path,
+                part_index=i,
+                total_parts=total_parts,
+                original_name=original_name,
+                data=data
+            )
+
+            out_paths.append(part_path)
+
+    return out_paths
+
+
+def is_delmode_enabled() -> bool:
+    config_path = _default_db_path()
+
+    if not os.path.exists(config_path):
+        return False
+
+    config = configparser.ConfigParser()
+    config.read(config_path, encoding="utf-8")
+
+    return config.getboolean("Split", "delmode", fallback=False)
+
+
+# ======================================================
+# 拡張子取得
+# ======================================================
+def get_file_extension(file_path: str) -> str:
+    if not isinstance(file_path, str) or not file_path.strip():
+        raise ValueError("ファイルパスは非空の文字列で指定してください。")
+    _, ext = os.path.splitext(file_path)
+    return ext
+
+
+# ======================================================
+# 結合（part0 → 自動判定）
+# ======================================================
+import re
+def merge_from_part0(part0_path, output_path=None):
+    part0_path = os.path.abspath(part0_path)
+
+    folder = os.path.dirname(part0_path)
+    base = os.path.basename(part0_path)
+    prefix = base[:-1]
+
+    pattern = re.compile(rf"^{re.escape(prefix)}\d+$")
+
+    parts = [
+        os.path.join(folder, fn)
+        for fn in os.listdir(folder)
+        if pattern.match(fn)
+    ]
+
+    return merge_files_with_header(parts, output_path)
+
+
+# ======================================================
+# 完全検証付き結合処理（署名付き）
+# ======================================================
+def merge_files_with_header(parts, output_path=None):
+    part_info = []
+
+    for path in parts:
+        try:
+            with open(path, "rb") as f:
+                raw = f.read(4)
+                if len(raw) < 4:
+                    continue
+
+                header_size = struct.unpack(">I", raw)[0]
+                header_raw = f.read(header_size)
+                header = json.loads(header_raw.decode("utf-8"))
+
+                required = ("original_name", "part_index", "total_parts", "sha256")
+                if not all(k in header for k in required):
+                    raise ValueError(f"{path} のヘッダーが不完全です")
+
+                part_info.append((header["part_index"], path, header))
+
+        except Exception as e:
+            raise ValueError(f"{path} の読み取り失敗: {e}")
+
+    if not part_info:
+        raise ValueError("適切なパートが見つかりません")
+
+    part_info.sort(key=lambda x: x[0])
+
+    names = {h["original_name"] for _,_,h in part_info}
+    if len(names) != 1:
+        raise ValueError("original_name が一致しません → 別ファイルのパートが混入")
+
+    original_name = part_info[0][2]["original_name"]
+
+    if ".." in original_name or "/" in original_name or "\\" in original_name:
+        raise ValueError("original_name に危険な文字列があります")
+
+    total_parts = part_info[0][2]["total_parts"]
+    if total_parts != len(part_info):
+        raise ValueError("total_parts と実パート数が一致しません")
+
+    indexes = [idx for idx,_,_ in part_info]
+    if sorted(indexes) != list(range(total_parts)):
+        raise ValueError("part_index が不正です（重複・欠落・範囲外）")
+
+    if output_path is None:
+        folder = os.path.dirname(parts[0])
+        output_path = os.path.join(folder, original_name)
+
+    with open(output_path, "wb") as out:
+        for idx, part_path, header in part_info:
+            with open(part_path, "rb") as f:
+                hsz = struct.unpack(">I", f.read(4))[0]
+                f.read(hsz)
+                payload = f.read()
+
+                # --- 署名検証 ---
+                if calc_sha256(payload) != header["sha256"]:
+                    raise ValueError(f"{part_path} は改ざんされています（ハッシュ不一致）")
+
+                out.write(payload)
+
+    return output_path

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/ensec_cli/cli.py

@@ -17,11 +17,15 @@ from . import rsa_encryptor
 from pathlib import Path
 from .conf_load import load_config
 from . import __version__ as VERSION
-
+from .ecc import *
+from .bin_ext import *
 # OKならそのまま続行
 
+is_split_enabled=False
 conf=load_config()
 
+ecc = False
+
 BLOCKCHAIN_HEADER = b'BLOCKCHAIN_DATA_START\n'
 def _format_bytes(num: int) -> str:
     units = ["B", "KB", "MB", "GB", "TB", "PB"]
@@ -164,26 +168,58 @@ def cli_encrypt(file_path, password, memo):
     username = getpass.getuser()
 
     try:
-        with lzma.open(file_path + ".vdec", 'rb') as f:
-            data = f.read()
+        with open(file_path + ".vdec", 'rb') as f:
+            raw_data = f.read()
+        if ecc==True:
+            try:
+                data = recover_data(raw_data)
+                if data is None:
+                    data = lzma.decompress(raw_data)
+            except(ValueError, lzma.LZMAError):
+                data = lzma.decompress(raw_data)
+        else:
+            data=lzma.decompress(raw_data)
         split_index = data.index(BLOCKCHAIN_HEADER)
         chain_json = data[split_index + len(BLOCKCHAIN_HEADER):].decode('utf-8')
         blockchain = Blockchain.from_json(chain_json)
-    except:
+    except Exception as e:
+        if os.path.exists(file_path + ".vdec") :
+            print("警告:既存のブロックチェーンデータの読み込みに失敗しました。\n新規にブロックチェーンを作成します。")
         blockchain = Blockchain()
+
     block = Block(file_hash, blockchain.chain[-1].hash if blockchain.chain else "0", "Encrypt", file_hash, username, memo)
     blockchain.add_block(block)
 
     encrypted_data = salt + nonce + ciphertext + tag
     blockchain_data = BLOCKCHAIN_HEADER + blockchain.to_json().encode('utf-8')
 
+    combined_data = encrypted_data + blockchain_data
+    # 先にLZMA圧縮
+    compressed_data = lzma.compress(combined_data)
+
+    if ecc==True and not is_split_enabled:
+        ecc_data = add_ecc(compressed_data)
+    else:
+        ecc_data = compressed_data
+
     out_path = file_path + ".vdec"
-    with lzma.open(out_path, 'wb') as f:
-        f.write(encrypted_data)
-        f.write(blockchain_data)
+    with open(out_path, 'wb') as f:
+        f.write(ecc_data)
+
+    if is_split_enabled:
+        a = split_file_with_header(out_path)
+        if a is not None:
+            display_path = a[0]
+        else:   
+            display_path = out_path
+    else:
+        display_path = out_path
+
+    if is_split_enabled:
+        delete_pre_file(out_path)
     if deletemode["mode"] == True:
         delete_pre_file(file_path)
-    print(f"✅ Encryption completed: {out_path}")
+    print(f"✅ Encryption completed: {display_path}")
 
 def cli_decrypt(file_path, password, memo):
     if file_path.endswith(".wav"):
@@ -191,8 +227,41 @@ def cli_decrypt(file_path, password, memo):
             wav_bytes = f.read()
         data = wavencode.wav_bytes_to_binary(wav_bytes)
     else:
-        with lzma.open(file_path, 'rb') as f:
-            data = f.read()
+        try:
+            with open(file_path, 'rb') as f:
+                data = f.read()
+            if  get_file_extension(file_path)!=".vdec0":  
+            # 分割ファイルでない場合はECC復元とLZMA展開を試みる。失敗したら（分割ファイルでない場合)LZMA展開のみ試みる。
+                if ecc==True:
+                    data = recover_data(data)  # ECC復元とLZMA展開を試みる（成功すればdataが更新される）
+            
+                    if data is None:
+                        raise ValueError("データの復元に失敗")
+                else:
+                    data = lzma.decompress(data)
+            elif get_file_extension(file_path)==".vdec0":
+                try:
+                    catc = merge_from_part0(file_path)
+                    if catc!=None:
+                        file_path=catc
+                        with open(file_path, 'rb') as f:
+                            data = f.read()
+                        data = lzma.decompress(data)
+                except Exception as e:
+                    print(f"エラー:次のエラーが発生しました:\n{e}")
+                    return None
+            else:
+                data = lzma.decompress(data)
+        except ValueError as e:
+            print("エラー:ファイルの読み込みに失敗しました")
+            print("ECCでも復元できないくらいにファイルが破損している可能性があります")
+            return
+        except EOFError:
+            print("エラー:圧縮データが途中で途切れています\n（ファイルが破損している可能性があります）\n分割データの場合必要なパーツが足りません")
+            return
+        except lzma.LZMAError:
+            print("エラー:LZMA展開に失敗しました")
+            return
 
     split_index = data.index(BLOCKCHAIN_HEADER)
     crypto_data = data[:split_index]
@@ -225,12 +294,24 @@ def cli_decrypt(file_path, password, memo):
     file_hash = hashlib.sha256(ciphertext).hexdigest()
     block = Block(file_hash, blockchain.chain[-1].hash if blockchain.chain else "0", "Decrypt", file_hash, username, memo)
     blockchain.add_block(block)
+    
+    # 暗号バイト列
+    encrypted_data = salt + nonce + ciphertext + tag
+    blockchain_data = BLOCKCHAIN_HEADER + blockchain.to_json().encode('utf-8')
+
+    combined_data = encrypted_data + blockchain_data
+    
+    compressed_data = lzma.compress(combined_data)
+    
+    if ecc==True:
+        ecc_data = add_ecc(compressed_data)
+    else:
+        ecc_data = compressed_data
 
     if not file_path.endswith(".wav"):
-        with lzma.open(file_path, 'wb') as f:
-            f.write(salt + nonce + ciphertext + tag)
-            f.write(BLOCKCHAIN_HEADER)
-            f.write(blockchain.to_json().encode('utf-8'))
+        with open(file_path, 'wb') as f:
+            f.write(ecc_data)
+            
 
     print(f"✅ Decryption completed: {output_file}")
 
@@ -239,8 +320,15 @@ def cli_verify_chain(file_path):
         with open(file_path, 'rb') as f:
             data = wavencode.wav_bytes_to_binary(f.read())
     else:
-        with lzma.open(file_path, 'rb') as f:
+        with open(file_path, 'rb') as f:
             data = f.read()
+        if ecc == True:
+            data = recover_data(data)
+            if data is None:
+                print("❌ Error: データの復元に失敗しました")
+                return
+        else:
+            data = lzma.decompress(data)
     split_index = data.index(BLOCKCHAIN_HEADER)
     chain_json = data[split_index + len(BLOCKCHAIN_HEADER):].decode('utf-8')
     blockchain = Blockchain.from_json(chain_json)
@@ -275,7 +363,9 @@ def password_from_keyfile(keyfile_path: str) -> str:
         sys.exit(1)
 
     return hashlib.sha256(data).hexdigest()
+
 def main():
+    global ecc
     parser = argparse.ArgumentParser(description="EncryptSecureDEC CLI")
     parser.add_argument("mode",choices=["encrypt","decrypt","verify-chain","sign",
                                         "verify-sign","key-protect-on","key-protect-off"])
@@ -288,8 +378,14 @@ def main():
     parser.add_argument("--pubkey", help="Path to public key file (only required in RSA encrypt mode)")
     parser.add_argument("--keyfile",help="Use a file as the password source for encryption/decryption")
     parser.add_argument("--version",action="version",version=f"ENSEC_CLI {VERSION}")
+    parser.add_argument("--ecc", action="store_true",help="Enable ECC protection")
+    parser.add_argument("--split",action="store_true",help="Split encrypted file")
     args = parser.parse_args()
-
+    if args.split:
+        global is_split_enabled
+        is_split_enabled=True
+    if args.ecc:
+        ecc=True
     # --- validate RSA/pubkey usage ---
         # --- validate RSA/pubkey usage ---
     if args.rsa:
@@ -327,7 +423,7 @@ def main():
         sys.exit(1)
 
     # For decrypt mode, check extension
-    if args.mode == "decrypt" and not (args.file.endswith(".vdec") or args.file.endswith(".rdec") or args.file.endswith(".esdc")):
+    if args.mode == "decrypt" and not (args.file.endswith(".vdec") or args.file.endswith(".rdec") or args.file.endswith(".esdc") or args.file.endswith(".vdec0")):
         print(f"❌ Error: The file for decryption must have a '.vdec' or '.rdec' extension.")
         sys.exit(1)
 

ensec_cli-2.1.0/ensec_cli/ecc.py

@@ -0,0 +1,29 @@
+from reedsolo import RSCodec, ReedSolomonError
+import lzma 
+ECC_BYTES = 32  # 32byteのECC。最大で約16byte分の破損を訂正可能
+rs = RSCodec(ECC_BYTES)
+
+def add_ecc(data: bytes) -> bytes:
+    """暗号化済みデータにECCを付与"""
+    return bytes(rs.encode(data))
+
+def recover_ecc(encoded: bytes) -> bytes:
+    """ECC付きデータを復元"""
+    try:
+        decoded = rs.decode(encoded)
+        return bytes(decoded[0])  # 元データ
+    except ReedSolomonError as e:
+        raise ValueError("ECCで復元できないほど破損しています") from e
+    
+def recover_data(data):
+    try:
+        compressed_data = recover_ecc(data)
+    except ValueError as e:
+        return None
+
+    try:
+        data = lzma.decompress(compressed_data)
+    except lzma.LZMAError:
+        print("エラーLZMA圧縮データの展開に失敗しました")
+        return None
+    return data

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/ensec_cli.egg-info/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.11
+Version: 2.1.0
 Summary: EncryptSecureDEC Open Source CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: pycryptodome
 Requires-Dist: cryptography
+Requires-Dist: reedsolo
 Dynamic: license-file
 
 # ENSEC-CLI

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/ensec_cli.egg-info/SOURCES.txt

@@ -2,8 +2,10 @@ LICENSE
 README.md
 pyproject.toml
 ensec_cli/__init__.py
+ensec_cli/bin_ext.py
 ensec_cli/cli.py
 ensec_cli/conf_load.py
+ensec_cli/ecc.py
 ensec_cli/esdcompress.py
 ensec_cli/passchk.py
 ensec_cli/rsa_encryptor.py

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/ensec_cli.egg-info/requires.txt

@@ -1,2 +1,3 @@
 pycryptodome
 cryptography
+reedsolo

{ensec_cli-1.0.11 → ensec_cli-2.1.0}/pyproject.toml

@@ -4,14 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ensec-cli"
-version = "1.0.11"
+version = "2.1.0"
 description = "EncryptSecureDEC Open Source CLI"
 requires-python = ">=3.9"
 readme = "README.md"
 
 dependencies = [
     "pycryptodome",
-    "cryptography"
+    "cryptography",
+    "reedsolo"
 ]
 [tool.setuptools]
 packages = ["ensec_cli"]

ensec_cli-1.0.11/ensec_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "1.0.11"