Merge branch 'v2'

Author: adorton-adobe

.changelog/changelog.md

@@ -1,3 +1,17 @@
+| tag | date | title |
+|---|---|---|
+| v2.6.5 | 2021-09-14 | User Sync Tool v2.6.5 |
+
+# Bug Fixes
+
+\#728 - Fix keyring misidentification issue
+
+# Build Information
+
+Builds are now made with Python 3.9 on all platforms
+
+---
+
 | tag | date | title |
 |---|---|---|
 | v2.6.4 | 2021-08-31 | User Sync Tool v2.6.4 |

.changelog/latest.md

@@ -1,10 +1,7 @@
 # Bug Fixes
 
-\#723 - Start/end sync signals
-\#700 - Fix some issues with SSL verification
-\#623 - Fix Adobe-only list with post-sync
+\#728 - Fix keyring misidentification issue
 
-# Misc
+# Build Information
 
-\#591 - Document Two-Step Lookup
-\#676 - Introduce Changelog
+Builds are now made with Python 3.9 on all platforms

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Set up Python 
       uses: actions/setup-python@v2
       with:
-        python-version: '3.6'
+        python-version: '3.9'
     - name: Ubuntu 
       if: matrix.os == 'ubuntu-latest'
       run: | 

.github/workflows/package-release.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: '3.6'
+        python-version: '3.9'
     - name: Get version tag
       id: get_version
       uses: battila7/get-version-action@v2
@@ -45,7 +45,7 @@ jobs:
     - name: Get build
       run: |
         cd dist
-        tar czf "user-sync-$UST_VERSION $UST_VARIANT_TAG-ubuntu.tar.gz" user-sync
+        tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-ubuntu.tar.gz" user-sync
       env:
         UST_VARIANT_TAG: ${{matrix.variant_tag}}
         UST_VERSION: ${{ steps.get_version.outputs.version }}
@@ -70,7 +70,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: '3.6'
+        python-version: '3.9'
     - name: Get version tag
       id: get_version
       uses: battila7/get-version-action@v2
@@ -117,24 +117,28 @@ jobs:
         uses: battila7/get-version-action@v2
       - name: Centos-Install dependencies
         run: |
-          yum install -y epel-release
-          yum install -y https://repo.ius.io/ius-release-el7.rpm
-          yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-          yum install -y gcc make python36u-devel python36u-pip python36u-virtualenv
-          yum install -y python-devel python-pip python-virtualenv
-          yum install -y pkgconfig openssl-devel dbus-glib-devel dbus-python libffi-devel
-          rm -f /usr/bin/python && ln -s /usr/bin/python3 /usr/bin/python
-      - name: Make Standalone
+          yum install -y pkgconfig gcc openssl-devel dbus-glib-devel dbus-python libffi-devel wget
+          mkdir tmp && cd tmp
+          wget https://www.python.org/ftp/python/3.9.7/Python-3.9.7.tgz
+          tar xzf Python-3.9.7.tgz
+          cd Python-3.9.7
+          ./configure --enable-optimizations --enable-shared
+          make altinstall
+          cd ../..
+      - name: Build executable
         run: |
-          pip3 install external/okta-0.0.3.1-py2.py3-none-any.whl
-          pip3 install -e .
-          pip3 install -e .[test]
-          pip3 install -e .[setup]
-          make standalone
+          export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib/
+          /usr/local/bin/python3.9 -m venv venv
+          source venv/bin/activate
+          python -m pip install --upgrade pip pyinstaller setuptools
+          pip install external/okta-0.0.3.1-py2.py3-none-any.whl
+          pip install -e .
+          pip install -e .[test]
+          pip install -e .[setup]
+          make
+          deactivate
         env:
           UST_EXTENSION: ${{matrix.extension_support}}
-      - name: Test with pytest
-        run: pytest -s
       - name: Get build
         run: |
           cd dist

user_sync/config.py

@@ -29,7 +29,6 @@
 
 import user_sync.helper
 import user_sync.identity_type
-import user_sync.port
 import user_sync.rules
 from user_sync import flags
 from user_sync.error import AssertionException
@@ -282,7 +281,7 @@ def get_umapi_options(self):
         secondary_config_sources = {}
         primary_config_sources = []
         for item in umapi_config:
-            if isinstance(item, six.string_types):
+            if isinstance(item, str):
                 if secondary_config_sources:
                     # if we see a string after a dict, the user has done something wrong, and we fail.
                     raise AssertionException("Secondary umapi configuration found with no prefix: " + item)
@@ -431,7 +430,7 @@ def get_post_sync_options(self):
     def as_list(value):
         if value is None:
             return []
-        elif isinstance(value, user_sync.port.list_type):
+        elif isinstance(value, list):
             return value
         return [value]
 
@@ -657,8 +656,8 @@ def create_assertion_error(self, message):
         return AssertionException("%s in: %s" % (message, self.get_full_scope()))
 
     def describe_types(self, types_to_describe):
-        if types_to_describe == six.string_types:
-            result = self.describe_types(user_sync.port.string_type)
+        if types_to_describe == str:
+            result = self.describe_types(str)
         elif isinstance(types_to_describe, tuple):
             result = []
             for type_to_describe in types_to_describe:
@@ -765,19 +764,19 @@ def get_string(self, key, none_allowed=False):
         """
         :rtype: basestring
         """
-        return self.get_value(key, six.string_types, none_allowed)
+        return self.get_value(key, str, none_allowed)
 
     def get_int(self, key, none_allowed=False):
         """
         :rtype: int
         """
-        return self.get_value(key, user_sync.port.integer_type, none_allowed)
+        return self.get_value(key, int, none_allowed)
 
     def get_bool(self, key, none_allowed=False):
         """
         :rtype: bool
         """
-        return self.get_value(key, user_sync.port.boolean_type, none_allowed)
+        return self.get_value(key, bool, none_allowed)
 
     def get_list(self, key, none_allowed=False):
         """
@@ -881,11 +880,18 @@ def get_value_from_keyring(secure_value_key, user_name):
         keyrings.cryptfile.cryptfile.CryptFileKeyring.keyring_key = "none"
 
         import keyring
-        if (isinstance(keyring.get_keyring(), keyring.backends.fail.Keyring) or
-                isinstance(keyring.get_keyring(), keyring.backends.chainer.ChainerBackend)):
+        k = keyring.get_keyring()
+
+        # If the keyring cannot connect to a backend, replace it with cryptfile
+        if isinstance(k, keyring.backends.fail.Keyring):
             keyring.set_keyring(keyrings.cryptfile.cryptfile.CryptFileKeyring())
 
-        logging.getLogger("keyring").info("Using keyring '" + keyring.get_keyring().name + "' to retrieve: " + secure_value_key)
+        try:
+            name = k.backends[0].name
+        except:
+            name = k.name
+
+        logging.getLogger("keyring").info("Using keyring '{}' to retrieve: {}".format(name, secure_value_key))
         return keyring.get_password(service_name=secure_value_key, username=user_name)
 
 
@@ -1060,7 +1066,7 @@ def process_path_value(cls, val, must_exist, can_have_subdict):
         :param must_exist: whether there must be a value
         :param can_have_subdict: whether the value can be a tagged string
         """
-        if isinstance(val, six.string_types):
+        if isinstance(val, str):
             return cls.relative_path(val, must_exist)
         elif isinstance(val, list):
             vals = []
@@ -1077,7 +1083,7 @@ def relative_path(cls, val, must_exist):
         """
         returns an absolute path that is resolved relative to the file being loaded
         """
-        if not isinstance(val, six.string_types):
+        if not isinstance(val, str):
             raise AssertionException("Expected pathname for setting %s in config file %s" %
                                      (cls.key_path, cls.filename))
         if val.startswith('$(') and val.endswith(')'):
@@ -1107,21 +1113,21 @@ def set_bool_value(self, key, default_value):
         :type key: str
         :type default_value: bool
         """
-        self.set_value(key, user_sync.port.boolean_type, default_value)
+        self.set_value(key, bool, default_value)
 
     def set_int_value(self, key, default_value):
         """
         :type key: str
         :type default_value: int
         """
-        self.set_value(key, user_sync.port.integer_type, default_value)
+        self.set_value(key, int, default_value)
 
     def set_string_value(self, key, default_value):
         """
         :type key: str
         :type default_value: Optional(str)
         """
-        self.set_value(key, six.string_types, default_value)
+        self.set_value(key, str, default_value)
 
     def set_dict_value(self, key, default_value):
         """
@@ -1138,7 +1144,7 @@ def set_value(self, key, allowed_types, default_value):
         self.options[key] = value
 
     def require_string_value(self, key):
-        return self.require_value(key, six.string_types)
+        return self.require_value(key, str)
 
     def require_value(self, key, allowed_types):
         config = self.default_config

user_sync/connector/directory_ldap.py

@@ -599,7 +599,7 @@ def get_attribute_value(cls, attributes, attribute_name, first_only=False):
         attribute_values = attributes.get(attribute_name)
         if attribute_values:
             try:
-                if isinstance(attribute_values, six.string_types):
+                if isinstance(attribute_values, str):
                     return attribute_values
                 else:
                     if first_only: