diff options
| author | Pete <petiepooo@gmail.com> | 2019-12-18 12:03:17 -0500 |
|---|---|---|
| committer | Xander Desai <xdesai@duosecurity.com> | 2019-12-18 12:03:17 -0500 |
| commit | d0d47c7959f4c5193b767ddea8b0affc25ca40f0 (patch) | |
| tree | 51687dd2b779237d1acd2363cd8ad0412aaf14e9 /Makefile | |
| parent | 8c4d7c4affad93cbdc70180d0eb11a4869e5b298 (diff) | |
| download | openvpn-duo-plugin-d0d47c7959f4c5193b767ddea8b0affc25ca40f0.tar.gz openvpn-duo-plugin-d0d47c7959f4c5193b767ddea8b0affc25ca40f0.zip | |
Python3 compatibility updates (#28)
* WIP: fix imports and exception calls for python3
* fix remaining utf-8 encoding issues
* fix init trying to return a value
* change expected control checks to bytes
* make comparison of request params non-ordered
python3's url request handler likes to reorder the parameters its given
this breaks the params out and checks each separately
* refactor to simplify params comparisons
* FIX: decode auth bytes back to a utf-8 string
* FIX: also decode response data bytes to utf-8
* FIX: do not decode response data if already a str
* enhance existing test to ensure auth is str no bytes
* change test req and import from mox to mox3
* add additional python versions to CI config
* fix failing 3.7 travis ci build
* Apply changes to duo_openvpn.py similar to what we do in duo_client_python
* Apply changes to https_wrapper similar to what we do in duo_client_python
* Fixup the import bugs
* Use six for StringIO import
* Include six for py2->py3 compat layer
* use explicit decoding on control file data
* Consistent encoding and updated variable names for clarity
* Revert variable names back again.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -23,7 +23,7 @@ install: duo_openvpn.so ifdef USE_PERL install -c duo_openvpn.pl -m 755 $(DESTDIR)$(PREFIX) else - install -c duo_openvpn.py https_wrapper.py -m 755 $(DESTDIR)$(PREFIX) + install -c duo_openvpn.py https_wrapper.py six.py -m 755 $(DESTDIR)$(PREFIX) endif uninstall: @@ -32,6 +32,7 @@ uninstall: rm -f $(DESTDIR)$(PREFIX)/duo_openvpn.pl rm -f $(DESTDIR)$(PREFIX)/duo_openvpn.py rm -f $(DESTDIR)$(PREFIX)/https_wrapper.py + rm -f $(DESTDIR)$(PREFIX)/six.py clean: rm -f *.so *.o |