Fixed wrong line offset when deleting peers; created bugfix version 0…

….1.3
towalink · Jul 28, 2020 · bec838f · bec838f
1 parent b103437
commit bec838f
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,34 @@
+# Changelog
+
+All notable changes to this project are documented in this file.
+
+## [Unreleased]
+
+### Added
+
+- n/a
+
+### Changed
+- n/a
+
+### Fixed
+- n/a
+
+## [0.1.3] - 2020-07-28
+
+### Fixed
+
+- Extended tests to detect wrong line offset when deleting peers.
+- Fixed wrong line offset when deleting peers.
+
+## [0.1.2] - 2020-07-11
+
+### Added
+
+- Prepared for first public release to PyPi.
+
+## [0.1.1] - 2020-07-11
+
+### Added
+
+- First public release to Github.
diff --git a/README.md b/README.md
@@ -102,10 +102,10 @@ Please see below for more detailed usage information.
   * wc = wgconfig.WGConfig('/etc/wireguard/wg0.conf')
 
 * read_file()
-  Reads the Wireguard config file into memory
+  Reads the WireGuard config file into memory
 
 * write_file(file)
-  Writes a Wireguard config file from memory to file
+  Writes a WireGuard config file from memory to file
 
   Parameters:
   * file (str, optional, default: None): Path of the WireGuard configuration file

diff --git a/src/README.md b/src/README.md
@@ -102,10 +102,10 @@ Please see below for more detailed usage information.
   * wc = wgconfig.WGConfig('/etc/wireguard/wg0.conf')
 
 * read_file()
-  Reads the Wireguard config file into memory
+  Reads the WireGuard config file into memory
 
 * write_file(file)
-  Writes a Wireguard config file from memory to file
+  Writes a WireGuard config file from memory to file
 
   Parameters:
   * file (str, optional, default: None): Path of the WireGuard configuration file

diff --git a/src/dist/wgconfig-0.1.2.tar.gz b/src/dist/wgconfig-0.1.2.tar.gz
diff --git a/src/dist/wgconfig-0.1.3.tar.gz b/src/dist/wgconfig-0.1.3.tar.gz
diff --git a/src/setup.py b/src/setup.py
@@ -7,13 +7,13 @@
 
 setup_kwargs = {
     'name': 'wgconfig',
-    'version': '0.1.2',
+    'version': '0.1.3',
     'author': 'Dirk Henrici',
     'author_email': '[email protected]',
     'description': 'parsing and writing WireGuard configuration files',
     'long_description': long_description,
     'long_description_content_type': 'text/markdown',
-    'url': 'https://www.github.com/towalink/',
+    'url': 'https://www.github.com/towalink/wgconfig',
     'packages': setuptools.find_packages(),
     'classifiers': [
         'Programming Language :: Python',
@@ -27,9 +27,10 @@
         'Intended Audience :: Information Technology'
     ],
     'python_requires': '>=3.5',
-    'keywords': 'WireGuard configuration wg',
+    'keywords': 'WireGuard configuration config wg',
     'project_urls': {
-        'Repository': 'https://www.github.com/towalink/',
+        'Repository': 'https://www.github.com/towalink/wgconfig',
+        'PyPi': 'https://pypi.org/project/wgconfig/'
     },
 }
 

diff --git a/src/wgconfig/__init__.py b/src/wgconfig/__init__.py
@@ -149,7 +149,7 @@ def del_peer(self, key):
         # Only keep needed lines
         result = []
         if section_firstline > 0:
-            result.extend(self.lines[0:(section_firstline - 1)])
+            result.extend(self.lines[0:section_firstline])
         result.extend(self.lines[(section_lastline + 1):])
         self.lines = result
         # Invalidate data cache

diff --git a/test/test_1.py b/test/test_1.py
@@ -191,9 +191,15 @@ def test_del_peer1(setup_testconfig1):
                                                              'Endpoint': '192.168.0.3:51820',
                                                              'PersistentKeepalive': 25,
                                                              'PublicKey': 'eBvBVLo6wH0XkBfIjeLPf8ydBTfU/gMqJOH4nmVXcDE=',
-                                                             '_index_firstline': 8,
-                                                             '_index_lastline': 15}}
+                                                             '_index_firstline': 9,
+                                                             '_index_lastline': 16}}
     assert wc.peers == peers, 'first peer incorrectly deleted'
+    interface = {'Address': 'fe80::1/64',
+                 'ListenPort': 51820,
+                 'PrivateKey': '6FYKQKEtGFAb5HSwyj5cQl3wgS1E9d6SqVjdVksOn2s=',
+                 '_index_firstline': 1,
+                 '_index_lastline': 6}
+    assert wc.interface == interface, 'first peer incorrectly deleted'
 
 def test_del_peer2(setup_testconfig1):
     wc = setup_testconfig1
@@ -207,6 +213,12 @@ def test_del_peer2(setup_testconfig1):
                                                              '_index_firstline': 9,
                                                              '_index_lastline': 14}}
     assert wc.peers == peers, 'second peer incorrectly deleted'
+    interface = {'Address': 'fe80::1/64',
+                 'ListenPort': 51820,
+                 'PrivateKey': '6FYKQKEtGFAb5HSwyj5cQl3wgS1E9d6SqVjdVksOn2s=',
+                 '_index_firstline': 1,
+                 '_index_lastline': 6}
+    assert wc.interface == interface, 'second peer incorrectly deleted'
 
 def test_add_attr1(setup_testconfig1):
     """add_attr to existing attr with value list"""