ensec-cli 1.0.10__tar.gz → 2.0.0__tar.gz

{ensec_cli-1.0.10 → ensec_cli-2.0.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.10
+Version: 2.0.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.0.0/ensec_cli/__init__.py

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

{ensec_cli-1.0.10 → ensec_cli-2.0.0}/ensec_cli/cli.py

@@ -17,11 +17,13 @@ from . import rsa_encryptor
 from pathlib import Path
 from .conf_load import load_config
 from . import __version__ as VERSION
-
+from .ecc import *
 # OKならそのまま続行
 
 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,23 +166,43 @@ 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:
+        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:
+        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 deletemode["mode"] == True:
         delete_pre_file(file_path)
     print(f"✅ Encryption completed: {out_path}")
@@ -191,8 +213,27 @@ 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 ecc==True:
+            # 分割ファイルでない場合はECC復元とLZMA展開を試みる。失敗したら（分割ファイルでない場合)LZMA展開のみ試みる。
+                data = recover_data(data)  # ECC復元とLZMA展開を試みる（成功すればdataが更新される）
+            
+                if data is None:
+                    raise ValueError("データの復元に失敗")
+            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 +266,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 +292,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)
@@ -276,6 +336,7 @@ def password_from_keyfile(keyfile_path: str) -> str:
 
     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"])
@@ -287,9 +348,12 @@ def main():
     parser.add_argument("--dir", action="store_true",help="Encrypt Dir mode")
     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("--version",action="version",version=f"ENSEC_CLI {VERSION}")
+    parser.add_argument("--ecc", action="store_true",help="Enable ECC protection")
     args = parser.parse_args()
-
+    
+    if args.ecc:
+        ecc=True
     # --- validate RSA/pubkey usage ---
         # --- validate RSA/pubkey usage ---
     if args.rsa:

ensec_cli-2.0.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.10 → ensec_cli-2.0.0}/ensec_cli.egg-info/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: ensec-cli
-Version: 1.0.10
+Version: 2.0.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.10 → ensec_cli-2.0.0}/ensec_cli.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ pyproject.toml
 ensec_cli/__init__.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.10 → ensec_cli-2.0.0}/ensec_cli.egg-info/requires.txt

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

{ensec_cli-1.0.10 → ensec_cli-2.0.0}/pyproject.toml

@@ -4,14 +4,15 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ensec-cli"
-version = "1.0.10"
+version = "2.0.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.10/ensec_cli/__init__.py

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