Skip to content

Commit ec60c5f

Browse files
committed
Merge branch 'v2'
2 parents 50fc77f + 04acb0d commit ec60c5f

27 files changed

+680
-342
lines changed

.appveyor/build.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
if ($env:python.endswith("36-x64")) {
2-
$ldapver="cp36-cp36m"
32
$pycmd = "${env:python}\python.exe"
43
& $pycmd -m venv venv
54
} else {
6-
$ldapver="cp27-cp27m"
75
$venvcmd = "${env:python}\Scripts\virtualenv.exe"
86
& $venvcmd venv
97
}
108
.\venv\Scripts\activate.ps1
119
pip install external\okta-0.0.3.1-py2.py3-none-any.whl
12-
pip install external\pyldap-2.4.45-${ldapver}-win_amd64.whl
1310
pip install -e .
1411
pip install -e .[test]
1512
pip install -e .[setup]

.build/pre_build.py

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import os
2+
import shutil
3+
4+
5+
def cd():
6+
os.chdir(os.path.realpath(os.path.join(os.path.dirname(__file__), '..')))
7+
8+
9+
def bundle_example_config():
10+
examples_dir = os.path.join('examples', 'config files - basic')
11+
files = [os.path.join(examples_dir, f) for f in os.listdir(examples_dir) if
12+
os.path.isfile(os.path.join(examples_dir, f))]
13+
bundle_dir = os.path.join('user_sync', 'resources', 'examples')
14+
if not os.path.exists(bundle_dir):
15+
os.mkdir(bundle_dir)
16+
for f in files:
17+
dest = os.path.join(bundle_dir, os.path.split(f)[-1])
18+
shutil.copy(f, dest)
19+
20+
21+
if __name__ == '__main__':
22+
cd()
23+
bundle_example_config()

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,8 @@ ENV/
9595
_site
9696
.sass-cache
9797
.jekyll-metadata
98+
99+
user_sync/resources/*
100+
!user_sync/resources/__init__.py
101+
!user_sync/resources/README.md
102+
!user_sync/resources/manual_url

.travis/install-centos.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ yum install -y epel-release
44
yum install -y https://centos7.iuscommunity.org/ius-release.rpm
55
yum install -y python36u-devel python36u-pip python36u-virtualenv
66
yum install -y python-devel python-pip python-virtualenv
7-
yum install -y pkgconfig openssl-devel openldap-devel dbus-glib-devel dbus-python libffi-devel
7+
yum install -y pkgconfig openssl-devel dbus-glib-devel dbus-python libffi-devel

.travis/install-ubuntu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ sudo apt-get update
33
sudo apt-get install -y software-properties-common
44
sudo apt-get install -y build-essential
55
sudo apt-get install -y python-dev python-pip python-virtualenv
6-
sudo apt-get install -y pkg-config libssl-dev libldap2-dev libsasl2-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev
6+
sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev
77
sudo apt-get install -y python3-dev python3-venv

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ endif
1818
pex:
1919
python -m pip install --upgrade pip
2020
python -m pip install --upgrade 'wheel<0.30.0' requests pex==1.5.3
21+
python .build/pre_build.py
2122
-$(RM) $(output_dir)
2223
pex -v -o $(output_dir)/$(output_filename)$(output_file_extension) -m user_sync.app \
2324
-f $(prebuilt_dir) \

docs/Gemfile.lock

Lines changed: 55 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
activesupport (4.2.10)
4+
activesupport (4.2.11.1)
55
i18n (~> 0.7)
66
minitest (~> 5.1)
77
thread_safe (~> 0.3, >= 0.3.4)
88
tzinfo (~> 1.1)
9-
addressable (2.5.2)
9+
addressable (2.6.0)
1010
public_suffix (>= 2.0.2, < 4.0)
1111
coffee-script (2.4.1)
1212
coffee-script-source
1313
execjs
1414
coffee-script-source (1.11.1)
1515
colorator (1.1.0)
16-
commonmarker (0.17.11)
16+
commonmarker (0.17.13)
1717
ruby-enum (~> 0.5)
18-
concurrent-ruby (1.0.5)
18+
concurrent-ruby (1.1.5)
1919
dnsruby (1.61.2)
2020
addressable (~> 2.5)
2121
em-websocket (0.5.1)
2222
eventmachine (>= 0.12.9)
2323
http_parser.rb (~> 0.6.0)
24-
ethon (0.11.0)
24+
ethon (0.12.0)
2525
ffi (>= 1.3.0)
2626
eventmachine (1.2.7)
27+
eventmachine (1.2.7-x64-mingw32)
2728
execjs (2.7.0)
28-
faraday (0.15.2)
29+
faraday (0.15.4)
2930
multipart-post (>= 1.2, < 3)
30-
ffi (1.9.25)
31+
ffi (1.11.1)
32+
ffi (1.11.1-x64-mingw32)
3133
forwardable-extended (2.6.0)
32-
gemoji (3.0.0)
33-
github-pages (191)
34-
activesupport (= 4.2.10)
35-
github-pages-health-check (= 1.8.1)
36-
jekyll (= 3.7.3)
34+
gemoji (3.0.1)
35+
github-pages (198)
36+
activesupport (= 4.2.11.1)
37+
github-pages-health-check (= 1.16.1)
38+
jekyll (= 3.8.5)
3739
jekyll-avatar (= 0.6.0)
3840
jekyll-coffeescript (= 1.1.1)
3941
jekyll-commonmark-ghpages (= 0.1.5)
4042
jekyll-default-layout (= 0.1.4)
41-
jekyll-feed (= 0.10.0)
43+
jekyll-feed (= 0.11.0)
4244
jekyll-gist (= 1.5.0)
43-
jekyll-github-metadata (= 2.9.4)
45+
jekyll-github-metadata (= 2.12.1)
4446
jekyll-mentions (= 1.4.1)
4547
jekyll-optional-front-matter (= 0.3.0)
4648
jekyll-paginate (= 1.1.0)
4749
jekyll-readme-index (= 0.2.0)
4850
jekyll-redirect-from (= 0.14.0)
49-
jekyll-relative-links (= 0.5.3)
51+
jekyll-relative-links (= 0.6.0)
5052
jekyll-remote-theme (= 0.3.1)
5153
jekyll-sass-converter (= 1.5.2)
5254
jekyll-seo-tag (= 2.5.0)
@@ -66,28 +68,28 @@ GEM
6668
jekyll-theme-tactile (= 0.1.1)
6769
jekyll-theme-time-machine (= 0.1.1)
6870
jekyll-titles-from-headings (= 0.5.1)
69-
jemoji (= 0.10.1)
71+
jemoji (= 0.10.2)
7072
kramdown (= 1.17.0)
7173
liquid (= 4.0.0)
7274
listen (= 3.1.5)
7375
mercenary (~> 0.3)
7476
minima (= 2.5.0)
75-
nokogiri (>= 1.8.2, < 2.0)
77+
nokogiri (>= 1.8.5, < 2.0)
7678
rouge (= 2.2.1)
7779
terminal-table (~> 1.4)
78-
github-pages-health-check (1.8.1)
80+
github-pages-health-check (1.16.1)
7981
addressable (~> 2.3)
8082
dnsruby (~> 1.60)
8183
octokit (~> 4.0)
82-
public_suffix (~> 2.0)
84+
public_suffix (~> 3.0)
8385
typhoeus (~> 1.3)
84-
html-pipeline (2.8.4)
86+
html-pipeline (2.11.0)
8587
activesupport (>= 2)
8688
nokogiri (>= 1.4)
8789
http_parser.rb (0.6.0)
8890
i18n (0.9.5)
8991
concurrent-ruby (~> 1.0)
90-
jekyll (3.7.3)
92+
jekyll (3.8.5)
9193
addressable (~> 2.4)
9294
colorator (~> 1.0)
9395
em-websocket (~> 0.5)
@@ -105,21 +107,21 @@ GEM
105107
jekyll-coffeescript (1.1.1)
106108
coffee-script (~> 2.2)
107109
coffee-script-source (~> 1.11.1)
108-
jekyll-commonmark (1.2.0)
110+
jekyll-commonmark (1.3.1)
109111
commonmarker (~> 0.14)
110-
jekyll (>= 3.0, < 4.0)
112+
jekyll (>= 3.7, < 5.0)
111113
jekyll-commonmark-ghpages (0.1.5)
112114
commonmarker (~> 0.17.6)
113115
jekyll-commonmark (~> 1)
114116
rouge (~> 2)
115117
jekyll-default-layout (0.1.4)
116118
jekyll (~> 3.0)
117-
jekyll-feed (0.10.0)
119+
jekyll-feed (0.11.0)
118120
jekyll (~> 3.3)
119121
jekyll-gist (1.5.0)
120122
octokit (~> 4.2)
121-
jekyll-github-metadata (2.9.4)
122-
jekyll (~> 3.1)
123+
jekyll-github-metadata (2.12.1)
124+
jekyll (~> 3.4)
123125
octokit (~> 4.0, != 4.4.0)
124126
jekyll-mentions (1.4.1)
125127
html-pipeline (~> 2.3)
@@ -131,7 +133,7 @@ GEM
131133
jekyll (~> 3.0)
132134
jekyll-redirect-from (0.14.0)
133135
jekyll (~> 3.3)
134-
jekyll-relative-links (0.5.3)
136+
jekyll-relative-links (0.6.0)
135137
jekyll (~> 3.3)
136138
jekyll-remote-theme (0.3.1)
137139
jekyll (~> 3.5)
@@ -185,9 +187,9 @@ GEM
185187
jekyll-seo-tag (~> 2.0)
186188
jekyll-titles-from-headings (0.5.1)
187189
jekyll (~> 3.3)
188-
jekyll-watch (2.0.0)
190+
jekyll-watch (2.2.1)
189191
listen (~> 3.0)
190-
jemoji (0.10.1)
192+
jemoji (0.10.2)
191193
gemoji (~> 3.0)
192194
html-pipeline (~> 2.2)
193195
jekyll (~> 3.0)
@@ -198,48 +200,53 @@ GEM
198200
rb-inotify (~> 0.9, >= 0.9.7)
199201
ruby_dep (~> 1.2)
200202
mercenary (0.3.6)
201-
mini_portile2 (2.3.0)
203+
mini_portile2 (2.4.0)
202204
minima (2.5.0)
203205
jekyll (~> 3.5)
204206
jekyll-feed (~> 0.9)
205207
jekyll-seo-tag (~> 2.1)
206208
minitest (5.11.3)
207-
multipart-post (2.0.0)
208-
nokogiri (1.8.4)
209-
mini_portile2 (~> 2.3.0)
210-
octokit (4.11.0)
209+
multipart-post (2.1.1)
210+
nokogiri (1.10.3)
211+
mini_portile2 (~> 2.4.0)
212+
nokogiri (1.10.3-x64-mingw32)
213+
mini_portile2 (~> 2.4.0)
214+
octokit (4.14.0)
211215
sawyer (~> 0.8.0, >= 0.5.3)
212-
pathutil (0.16.1)
216+
pathutil (0.16.2)
213217
forwardable-extended (~> 2.6)
214-
public_suffix (2.0.5)
218+
public_suffix (3.1.0)
215219
rb-fsevent (0.10.3)
216-
rb-inotify (0.9.10)
217-
ffi (>= 0.5.0, < 2)
220+
rb-inotify (0.10.0)
221+
ffi (~> 1.0)
218222
rouge (2.2.1)
219223
ruby-enum (0.7.2)
220224
i18n
221225
ruby_dep (1.5.0)
222-
rubyzip (1.2.1)
223-
safe_yaml (1.0.4)
224-
sass (3.5.7)
226+
rubyzip (1.2.3)
227+
safe_yaml (1.0.5)
228+
sass (3.7.4)
225229
sass-listen (~> 4.0.0)
226230
sass-listen (4.0.0)
227231
rb-fsevent (~> 0.9, >= 0.9.4)
228232
rb-inotify (~> 0.9, >= 0.9.7)
229-
sawyer (0.8.1)
230-
addressable (>= 2.3.5, < 2.6)
231-
faraday (~> 0.8, < 1.0)
233+
sawyer (0.8.2)
234+
addressable (>= 2.3.5)
235+
faraday (> 0.8, < 2.0)
232236
terminal-table (1.8.0)
233237
unicode-display_width (~> 1.1, >= 1.1.1)
234238
thread_safe (0.3.6)
235-
typhoeus (1.3.0)
239+
typhoeus (1.3.1)
236240
ethon (>= 0.9.0)
237241
tzinfo (1.2.5)
238242
thread_safe (~> 0.1)
239-
unicode-display_width (1.4.0)
243+
tzinfo-data (1.2019.1)
244+
tzinfo (>= 1.0.0)
245+
unicode-display_width (1.6.0)
240246

241247
PLATFORMS
242248
ruby
249+
x64-mingw32
243250

244251
DEPENDENCIES
245252
github-pages
@@ -248,7 +255,7 @@ DEPENDENCIES
248255
tzinfo-data
249256

250257
RUBY VERSION
251-
ruby 2.5.1p57
258+
ruby 2.6.3p62
252259

253260
BUNDLED WITH
254-
1.16.4
261+
1.17.2

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,17 @@ password: "LDAP password goes here"
2222
host: "ldap://ldap.example.com"
2323
base_dn: "DC=example,DC=com"
2424

25+
# (optional) You can specify what Authentication method to bind LDAP
26+
# connection with. You can choose either Anonymous, Simple or NTLM.
27+
# If username is not specified above, the LDAP connector will override
28+
# the authentication method and set it to 'anonymous'.
29+
# If you choose anonymous, you don't have to specify username and password above.
30+
# If you choose simple, you must provide a username and password.
31+
# If you choose NTLM, you have to specify the username in this format [Domain]\[Username]
32+
# for example EXAMPLE\JDOE. You can specify NTLM Password Hash or ClearText for a password.
33+
# Default authentication method: Simple
34+
# authentication_method: Simple
35+
2536
# (optional) You can store credentials in the operating system credential store
2637
# (Windows Credential Manager, Mac Keychain, Linux Freedesktop Secret Service
2738
# or KWallet - these will be built into the Linux distribution).
-1.05 MB
Binary file not shown.
-1.05 MB
Binary file not shown.

0 commit comments

Comments
 (0)