Merge pull request #3 from qtc-de/develop

Prepare v1.0.2 Release
qtc-de · May 26, 2022 · 258bda0 · 258bda0
2 parents 9df2817 + 74f0e11
commit 258bda0
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,29 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+
+## [1.0.2] - May 26, 2022
+
+### Changed
+
+* Fixed a bug that prevented the `--type` option from working when using the `sddl` action
+
+
+## [1.0.1] - Aug 08, 2020
+
+### Added
+
+* Automated pushes to *PyPi* by using *GitHub workflows*
+
+### Changed
+
+* Fix a bug in `setup.py` that caused the tests folder to be installed as a package
+
+
+## [1.0.0] - Aug 05, 2020
+
+Initial release :)
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ simple modifications on Windows related formats.
 
 ![](https://github.com/qtc-de/wconv/workflows/master%20Python%20CI/badge.svg?branch=master)
 ![](https://github.com/qtc-de/wconv/workflows/develop%20Python%20CI/badge.svg?branch=develop)
-![example-gif](./images/example.gif)
+![example-gif](https://github.com/qtc-de/wconv/raw/master/images/example.gif)
 
 
 ### Table of Contents
@@ -61,17 +61,17 @@ $ git clone https://github.com/qtc-de/wconv
 $ cd wconv
 $ pip3 install -r requirements.txt
 $ python3 setup.py sdist
-$ pip3 install dist/wconv-0.8.0.tar.gz
+$ pip3 install dist/*
 ```
 
-Additionally, *wconv* ships a [bash-completion](./bash_completion.d/wconv) script.
+Additionally, *wconv* ships a [bash-completion](./wconv/resources/bash_completion.d/wconv) script.
 The completion script is installed automatically, but relies on the [completion-helpers](https://github.com/qtc-de/completion-helpers)
 package. If *completion-helpers* is already installed, autocompletion for *wconv* should
 work after installing the pip package. Otherwise, you may need to copy the completion
 script manually:
 
 ```console
-$ cp ./bash_completion.d/wconv ~/.bash_completion.d
+$ cp wconv/resources/bash_completion.d/wconv ~/.bash_completion.d
 ```
 
 

diff --git a/bin/wconv b/bin/wconv
@@ -11,10 +11,9 @@ import wconv.sddl
 from termcolor import cprint
 
 
-parser = argparse.ArgumentParser(description='''wconv is a command line utility that can be used to convert
-                                                certain Windows representations into human readable formats.
-                                                Currently the tool supports convertion of ACE, SDDL, SID and
-                                                UAC values.''')
+parser = argparse.ArgumentParser(description='''wconv v1.0.2 - a command line utility to convert Windows specific
+                                                formats into human readable form. Currently, wconv supports convertion
+                                                of ACE, SDDL, SID and UAC values.''')
 
 subparsers = parser.add_subparsers(dest='command')
 

diff --git a/setup.py b/setup.py
@@ -53,7 +53,7 @@ def setup_completion():
     url='https://github.com/qtc-de/wconv',
     name=name,
     author='Tobias Neitzel (@qtc_de)',
-    version='1.0.1',
+    version='1.0.2',
     author_email='',
 
     description='wconv - Converting Windows native formats to human readable form',

diff --git a/wconv/ace.py b/wconv/ace.py
@@ -325,7 +325,6 @@ def get_permission_dict(permission_type):
         permission_dict         (dict)          Dictionary containing permission map
     '''
     try:
-
         mapping = PERM_TYPE_MAPPING[permission_type]
         return mapping
 

diff --git a/wconv/resources/bash_completion.d/wconv b/wconv/resources/bash_completion.d/wconv
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+type _comp_contains &> /dev/null || return
 type _comp_filter &> /dev/null || return
 type _comp_filter_shorts &> /dev/null || return
 

diff --git a/wconv/sddl.py b/wconv/sddl.py
@@ -219,7 +219,7 @@ def from_string(sddl_string, perm_type='file'):
         acl_flags = Sddl.get_acl_flags(acl_type_split[1])
         owner = Sddl.get_owner(sddl_header_string)
         group = Sddl.get_group(sddl_header_string)
-        ace_list = Sddl.get_ace_list(sddl_ace_string)
+        ace_list = Sddl.get_ace_list(sddl_ace_string, perm_type)
 
         return Sddl(owner, group, acl_type, acl_flags, ace_list)
-Original file line number
+Diff line change
@@ Expand Up / @@ -325,7 +325,6 @@ def get_permission_dict(permission_type): @@
             permission_dict         (dict)          Dictionary containing permission map
         '''
         try:
             mapping = PERM_TYPE_MAPPING[permission_type]
             return mapping
@@ Expand Down @@