Merge branch 'v2'

Author: adorton-adobe

.appveyor/build.ps1

@@ -1,15 +1,12 @@
 if ($env:python.endswith("36-x64")) {
-    $ldapver="cp36-cp36m"
     $pycmd = "${env:python}\python.exe"
     & $pycmd -m venv venv
 } else {
-    $ldapver="cp27-cp27m"
     $venvcmd = "${env:python}\Scripts\virtualenv.exe"
     & $venvcmd venv
 }
 .\venv\Scripts\activate.ps1
 pip install external\okta-0.0.3.1-py2.py3-none-any.whl
-pip install external\pyldap-2.4.45-${ldapver}-win_amd64.whl
 pip install -e .
 pip install -e .[test]
 pip install -e .[setup]

.build/pre_build.py

@@ -0,0 +1,23 @@
+import os
+import shutil
+
+
+def cd():
+    os.chdir(os.path.realpath(os.path.join(os.path.dirname(__file__), '..')))
+
+
+def bundle_example_config():
+    examples_dir = os.path.join('examples', 'config files - basic')
+    files = [os.path.join(examples_dir, f) for f in os.listdir(examples_dir) if
+             os.path.isfile(os.path.join(examples_dir, f))]
+    bundle_dir = os.path.join('user_sync', 'resources', 'examples')
+    if not os.path.exists(bundle_dir):
+        os.mkdir(bundle_dir)
+    for f in files:
+        dest = os.path.join(bundle_dir, os.path.split(f)[-1])
+        shutil.copy(f, dest)
+
+
+if __name__ == '__main__':
+    cd()
+    bundle_example_config()

.gitignore

@@ -95,3 +95,8 @@ ENV/
 _site
 .sass-cache
 .jekyll-metadata
+
+user_sync/resources/*
+!user_sync/resources/__init__.py
+!user_sync/resources/README.md
+!user_sync/resources/manual_url

.travis/install-centos.sh

@@ -4,4 +4,4 @@ yum install -y epel-release
 yum install -y https://centos7.iuscommunity.org/ius-release.rpm
 yum install -y python36u-devel python36u-pip python36u-virtualenv
 yum install -y python-devel python-pip python-virtualenv
-yum install -y pkgconfig openssl-devel openldap-devel dbus-glib-devel dbus-python libffi-devel
+yum install -y pkgconfig openssl-devel dbus-glib-devel dbus-python libffi-devel

.travis/install-ubuntu.sh

@@ -3,5 +3,5 @@ sudo apt-get update
 sudo apt-get install -y software-properties-common
 sudo apt-get install -y build-essential
 sudo apt-get install -y python-dev python-pip python-virtualenv
-sudo apt-get install -y pkg-config libssl-dev libldap2-dev libsasl2-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev
+sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev
 sudo apt-get install -y python3-dev python3-venv

Makefile

@@ -18,6 +18,7 @@ endif
 pex:
 	python -m pip install --upgrade pip
 	python -m pip install --upgrade 'wheel<0.30.0' requests pex==1.5.3
+	python .build/pre_build.py
 	-$(RM) $(output_dir)
 	pex -v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
 		-f $(prebuilt_dir) \

docs/Gemfile.lock

@@ -1,52 +1,54 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.10)
+    activesupport (4.2.11.1)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.11.1)
     colorator (1.1.0)
-    commonmarker (0.17.11)
+    commonmarker (0.17.13)
       ruby-enum (~> 0.5)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.5)
     dnsruby (1.61.2)
       addressable (~> 2.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    ethon (0.11.0)
+    ethon (0.12.0)
       ffi (>= 1.3.0)
     eventmachine (1.2.7)
+    eventmachine (1.2.7-x64-mingw32)
     execjs (2.7.0)
-    faraday (0.15.2)
+    faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.25)
+    ffi (1.11.1)
+    ffi (1.11.1-x64-mingw32)
     forwardable-extended (2.6.0)
-    gemoji (3.0.0)
-    github-pages (191)
-      activesupport (= 4.2.10)
-      github-pages-health-check (= 1.8.1)
-      jekyll (= 3.7.3)
+    gemoji (3.0.1)
+    github-pages (198)
+      activesupport (= 4.2.11.1)
+      github-pages-health-check (= 1.16.1)
+      jekyll (= 3.8.5)
       jekyll-avatar (= 0.6.0)
       jekyll-coffeescript (= 1.1.1)
       jekyll-commonmark-ghpages (= 0.1.5)
       jekyll-default-layout (= 0.1.4)
-      jekyll-feed (= 0.10.0)
+      jekyll-feed (= 0.11.0)
       jekyll-gist (= 1.5.0)
-      jekyll-github-metadata (= 2.9.4)
+      jekyll-github-metadata (= 2.12.1)
       jekyll-mentions (= 1.4.1)
       jekyll-optional-front-matter (= 0.3.0)
       jekyll-paginate (= 1.1.0)
       jekyll-readme-index (= 0.2.0)
       jekyll-redirect-from (= 0.14.0)
-      jekyll-relative-links (= 0.5.3)
+      jekyll-relative-links (= 0.6.0)
       jekyll-remote-theme (= 0.3.1)
       jekyll-sass-converter (= 1.5.2)
       jekyll-seo-tag (= 2.5.0)
@@ -66,28 +68,28 @@ GEM
       jekyll-theme-tactile (= 0.1.1)
       jekyll-theme-time-machine (= 0.1.1)
       jekyll-titles-from-headings (= 0.5.1)
-      jemoji (= 0.10.1)
+      jemoji (= 0.10.2)
       kramdown (= 1.17.0)
       liquid (= 4.0.0)
       listen (= 3.1.5)
       mercenary (~> 0.3)
       minima (= 2.5.0)
-      nokogiri (>= 1.8.2, < 2.0)
+      nokogiri (>= 1.8.5, < 2.0)
       rouge (= 2.2.1)
       terminal-table (~> 1.4)
-    github-pages-health-check (1.8.1)
+    github-pages-health-check (1.16.1)
       addressable (~> 2.3)
       dnsruby (~> 1.60)
       octokit (~> 4.0)
-      public_suffix (~> 2.0)
+      public_suffix (~> 3.0)
       typhoeus (~> 1.3)
-    html-pipeline (2.8.4)
+    html-pipeline (2.11.0)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.3)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -105,21 +107,21 @@ GEM
     jekyll-coffeescript (1.1.1)
       coffee-script (~> 2.2)
       coffee-script-source (~> 1.11.1)
-    jekyll-commonmark (1.2.0)
+    jekyll-commonmark (1.3.1)
       commonmarker (~> 0.14)
-      jekyll (>= 3.0, < 4.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-commonmark-ghpages (0.1.5)
       commonmarker (~> 0.17.6)
       jekyll-commonmark (~> 1)
       rouge (~> 2)
     jekyll-default-layout (0.1.4)
       jekyll (~> 3.0)
-    jekyll-feed (0.10.0)
+    jekyll-feed (0.11.0)
       jekyll (~> 3.3)
     jekyll-gist (1.5.0)
       octokit (~> 4.2)
-    jekyll-github-metadata (2.9.4)
-      jekyll (~> 3.1)
+    jekyll-github-metadata (2.12.1)
+      jekyll (~> 3.4)
       octokit (~> 4.0, != 4.4.0)
     jekyll-mentions (1.4.1)
       html-pipeline (~> 2.3)
@@ -131,7 +133,7 @@ GEM
       jekyll (~> 3.0)
     jekyll-redirect-from (0.14.0)
       jekyll (~> 3.3)
-    jekyll-relative-links (0.5.3)
+    jekyll-relative-links (0.6.0)
       jekyll (~> 3.3)
     jekyll-remote-theme (0.3.1)
       jekyll (~> 3.5)
@@ -185,9 +187,9 @@ GEM
       jekyll-seo-tag (~> 2.0)
     jekyll-titles-from-headings (0.5.1)
       jekyll (~> 3.3)
-    jekyll-watch (2.0.0)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
-    jemoji (0.10.1)
+    jemoji (0.10.2)
       gemoji (~> 3.0)
       html-pipeline (~> 2.2)
       jekyll (~> 3.0)
@@ -198,48 +200,53 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    mini_portile2 (2.3.0)
+    mini_portile2 (2.4.0)
     minima (2.5.0)
       jekyll (~> 3.5)
       jekyll-feed (~> 0.9)
       jekyll-seo-tag (~> 2.1)
     minitest (5.11.3)
-    multipart-post (2.0.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    octokit (4.11.0)
+    multipart-post (2.1.1)
+    nokogiri (1.10.3)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.3-x64-mingw32)
+      mini_portile2 (~> 2.4.0)
+    octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    pathutil (0.16.1)
+    pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (3.1.0)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
-      ffi (>= 0.5.0, < 2)
+    rb-inotify (0.10.0)
+      ffi (~> 1.0)
     rouge (2.2.1)
     ruby-enum (0.7.2)
       i18n
     ruby_dep (1.5.0)
-    rubyzip (1.2.1)
-    safe_yaml (1.0.4)
-    sass (3.5.7)
+    rubyzip (1.2.3)
+    safe_yaml (1.0.5)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sawyer (0.8.1)
-      addressable (>= 2.3.5, < 2.6)
-      faraday (~> 0.8, < 1.0)
+    sawyer (0.8.2)
+      addressable (>= 2.3.5)
+      faraday (> 0.8, < 2.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
-    typhoeus (1.3.0)
+    typhoeus (1.3.1)
       ethon (>= 0.9.0)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
+    tzinfo-data (1.2019.1)
+      tzinfo (>= 1.0.0)
+    unicode-display_width (1.6.0)
 
 PLATFORMS
   ruby
+  x64-mingw32
 
 DEPENDENCIES
   github-pages
@@ -248,7 +255,7 @@ DEPENDENCIES
   tzinfo-data
 
 RUBY VERSION
-   ruby 2.5.1p57
+   ruby 2.6.3p62
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

examples/config files - basic/connector-ldap.yml

@@ -22,6 +22,17 @@ password: "LDAP password goes here"
 host: "ldap://ldap.example.com"
 base_dn: "DC=example,DC=com"
 
+# (optional) You can specify what Authentication method to bind LDAP
+# connection with. You can choose either Anonymous, Simple or NTLM.
+# If username is not specified above, the LDAP connector will override
+# the authentication method and set it to 'anonymous'.
+# If you choose anonymous, you don't have to specify username and password above.
+# If you choose simple, you must provide a username and password.
+# If you choose NTLM, you have to specify the username in this format [Domain]\[Username]
+# for example EXAMPLE\JDOE. You can specify NTLM Password Hash or ClearText for a password.
+# Default authentication method: Simple
+# authentication_method: Simple
+
 # (optional) You can store credentials in the operating system credential store
 # (Windows Credential Manager, Mac Keychain, Linux Freedesktop Secret Service
 # or KWallet - these will be built into the Linux distribution).