Merge pull request #11 from dev4hobby/release

Release/ new structure into main branch

Author: aciddust

.gitignore

@@ -4,9 +4,17 @@ __pycache__/
 *$py.class
 # << Python << #
 
+# >> Python: build package >> #
+*.egg-info
+build.sh
+clean.sh
+build
+dist
+# << Python: build package<< #
+
 # >> misc: image >> #
 misc/
-!image_out.png
-!image.png
+!input.png
+!output.png
 *.png
 # << misc: image << #

README.md

@@ -1,6 +1,6 @@
 # Image Steganography
 
-![image_out](./image_out.png)  
+![image_out](./output.png)  
 What you see isn't everything.  
 This image contains hidden data.
 
@@ -38,7 +38,7 @@ python hide.py
 or
 
 ```bash
-python hide.py -in image.png -out image_out.png -m payload.txt
+python hide.py -in image.png -out output.png -m message.txt
 ```
 
 ### Seek message
@@ -52,7 +52,7 @@ python seek.py
 or
 
 ```bash
-python seek.py -in image_out.png
+python seek.py -in output.png
 ```
 
 ## Serve as WebServer (with FastAPI)
@@ -92,9 +92,9 @@ You can check the image path or other required values.
   "encoding": "utf8",
   "bits": 8,
   "token_string": "#secret#",
-  "payload": "./payload.txt",
+  "message": "./message.txt",
   "in_image": "./image.png",
-  "out_image": "./image_out.png",
-  "modified_image": "./image_out.png"
+  "out_image": "./output.png",
+  "modified_image": "./output.png"
 }
 ```

binjector/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Seongchuel Ahn
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

binjector/README.md

@@ -0,0 +1,27 @@
+# Binjector
+
+Binjector a.k.a Binary Injector makes your text inject into image easily.  
+[Web version](https://image-steganography.vercel.app/)  
+[Git: main](https://github.com/dev4hobby/image-steganography)  
+
+## Usage
+
+### Instalation
+
+```bash
+pip install binjector
+```
+
+### Hide
+
+```bash
+binjector hide -i image.png -m text.txt [-o output.png]
+```
+
+### Seek
+
+```bash
+binjector seek -i image.png
+```
+
+Have Fun

binjector/__init__.py

@@ -0,0 +1,57 @@
+import click
+from binjector.utils import read_settings, set_token
+from binjector.steganography import Steganography
+
+@click.group()
+def cli():
+    pass
+
+@cli.command()
+@click.option('-i', required=True, type=click.Path(exists=True), help='Input file')
+@click.option('-o', type=click.Path(exists=False), help='Output file')
+@click.option('-m', required= True, type=click.Path(exists=True), help='Message file')
+def hide(i, o, m):
+    s = Steganography()
+    # hide your message into image
+    if not o:
+        from datetime import datetime
+        o = f'output_{datetime.now().strftime("%Y%m%d_%H%M%S")}.png'
+    try:
+        with open(m, "r") as message_file:
+            message = message_file.read()
+        s.hide_message(i, o, message)
+        print('Done')
+    except Exception as e:
+        print(e)
+        raise e
+
+@cli.command()
+@click.option('-i', required=True, type=click.Path(exists=True), help='Input file')
+def seek(i):
+    s = Steganography()
+    # seek your message into image
+    try:
+        print(s.seek_message(i))
+    except Exception as e:
+        print(e)
+        raise e
+
+@cli.command()
+def settings():
+    try:
+        config = read_settings()
+        print(config)
+    except Exception as e:
+        print(e)
+        raise e
+
+@cli.command()
+def refresh_token():
+    try:
+        set_token()
+    except Exception as e:
+        print(e)
+        raise e
+
+if __name__ == '__main__': 
+    cli()

binjector/__main__.py

@@ -0,0 +1,2 @@
+numpy>=1.21.2
+Pillow>=8.3.2

binjector/requirements.txt

@@ -4,16 +4,15 @@
 from PIL import Image
 from typing import Union, Tuple
 from pathlib import Path
-from utils import get_timestamp_as_md5
+from .utils import get_timestamp_as_md5, read_settings
 
 class Steganography():
     '''
     class for hiding and extracting message on your image
     '''
 
     def __init__(self):
-        with open("settings.json", "r") as setting_file:
-            settings = json.load(setting_file)
+        settings = read_settings()
         self.bits = int(settings.get('bits', 8))
         self.encoding = settings.get('encoding', 'utf-8')
         self.token_string = settings.get('token_string', '#secret#')
@@ -31,15 +30,6 @@ def binstr_to_ascii(self, message:str) -> str: ###
         '''
         Convert binary string to ascii string
         '''
-        
-        # only ASCII
-        # binstr = map(''.join, zip(*[iter(message)]*8))
-        # result = str()
-        # for idx, bin in enumerate(binstr):
-        #     print(bin)
-        #     result += chr(int(bin, 2))
-
-        # for UTF-8
         byte_list = [message[i:i+8] for i in range(0, len(message), 8)]
         result = bytes([int(uint8, 2) for uint8 in byte_list]).decode('utf-8')
         return result
@@ -83,8 +73,6 @@ def message_to_binary(self, message:Union[bytes, str, int, np.ndarray, np.uint8]
             return ''.join(format(ord(char), '08b') for char in message)
         elif type(message) == bytes or type(message) == np.ndarray:
             return [ format(i, "08b") for i in message]
-        # elif type(message) == int or type(message) == np.uint8:
-        #     return format(message, "08b")
         else:
             raise TypeError("Input type not supported")
 
@@ -133,7 +121,7 @@ def get_lsb_string(self, imarray: np.ndarray) -> str:
         done = False
         for row_index, row in enumerate(imarray):
             for col_index, col in enumerate(row):
-                r, g, b = self.message_to_binary(col) # unpack
+                r, g, b = self.message_to_binary(col)
                 binary_message += r[-1] + g[-1] + b[-1] 
                 binary_token_index = binary_message.find(binary_token)
                 if binary_token_index != -1:

steganography.py binjector/steganography.pysteganography.py renamed to binjector/steganography.py

@@ -0,0 +1,35 @@
+import json
+from hashlib import md5
+from datetime import datetime
+
+def get_timestamp_as_md5():
+    return md5(str(datetime.now()).encode('utf-8')).hexdigest()
+
+def create_settings():
+    settings = {
+        "encoding": "utf8",
+        "bits": 8,
+        "token_string": get_timestamp_as_md5(),
+        "message": "./message.txt",
+        "in_image": "./input.png",
+        "out_image": "./output.png",
+        "modified_image": "./output.png"
+    }
+    with open("./settings.json", "w") as setting_file:
+        json.dump(settings, setting_file)
+
+def read_settings() -> dict:
+    try:
+        with open("settings.json", "r") as setting_file:
+            settings = json.load(setting_file)
+        return settings
+    except FileNotFoundError:
+        create_settings()
+        return read_settings()
+
+def set_token():
+    settings = read_settings()
+    settings['token'] = get_timestamp_as_md5()
+    with open("./settings.json", "w") as setting_file:
+        json.dump(settings, setting_file)
+    print ("Token set to: " + settings['token'])

binjector/utils.py

@@ -1,16 +1,16 @@
 import json
 import argparse
-from steganography import Steganography
+from binjector.steganography import Steganography
+from binjector.utils import read_settings
 
 parser = argparse.ArgumentParser(description='Hide a message in an image.')
 parser.add_argument('-in', '--in-image', help='The image to hide the message in.', required=False)
 parser.add_argument('-out', '--out-image', help='The image to save the message in.', required=False)
 parser.add_argument('-m', '--message', help='The message file path to hide.', required=False)
 args = parser.parse_args()
 
-with open("settings.json", "r") as setting_file:
-  settings = json.load(setting_file)
-message_file_name = args.message if args.message else settings.get('payload')
+settings = read_settings()
+message_file_name = args.message if args.message else settings.get('message')
 in_file_name = args.in_image if args.in_image else settings.get('in_image')
 out_file_name = args.out_image if args.out_image else settings.get('out_image')