Skip to content

Commit 9d57487

Browse files
mbonishmbonish
authored
Merge branch 'adobe-apiplatform:v2' into v2
2 parents 946a6d0 + 4420398 commit 9d57487

File tree

9 files changed

+54
-16
lines changed

9 files changed

+54
-16
lines changed

‎.changelog/changelog.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
| tag | date | title |
2+
|---|---|---|
3+
| v2.6.3 | 2021-07-15 | User Sync Tool v2.6.3 |
4+
5+
# Bug Fixes
6+
7+
\#700 - Fix some issues with SSL verification
8+
\#623 - Fix Adobe-only list with post-sync
9+
10+
# Misc
11+
12+
\#591 - Document Two-Step Lookup
13+
\#676 - Introduce Changelog
14+
15+
---
16+
117
| tag | date | title |
218
|---|---|---|
319
| v2.6.2 | 2020-12-04 | User Sync Tool v2.6.2 |

‎.changelog/latest.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
v2.6.2 - 2020-12-04
2-
3-
# New Features
1+
# Bug Fixes
42

5-
\#598 - Add logging for user actions and umapi progress
6-
\#596 - Add info about platform and test mode
3+
\#700 - Fix some issues with SSL verification
4+
\#623 - Fix Adobe-only list with post-sync
75

8-
# Bug Fixes
6+
# Misc
97

10-
\#659 - Support Specifying Domain Name for Kerberos Authentication
11-
\#663 - Prevent start_tls before Bind on LDAPS Connection
8+
\#591 - Document Two-Step Lookup
9+
\#676 - Introduce Changelog

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
matrix:
1515
os: [ubuntu-latest, windows-latest]
16-
16+
extension_support: [0, 1]
1717

1818
steps:
1919
- uses: actions/checkout@v2
@@ -37,7 +37,9 @@ jobs:
3737
pip install -e .
3838
pip install -e .[test]
3939
pip install -e .[setup]
40-
- run: |
41-
make standalone
40+
- name: Create build
41+
env:
42+
UST_EXTENSION: ${{ matrix.extension_support }}
43+
run: make
4244
- name: Test with pytest
4345
run: pytest

‎docs/Gemfile.lock‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GEM
44
activesupport (3.2.22.5)
55
i18n (~> 0.6, >= 0.6.4)
66
multi_json (~> 1.0)
7-
addressable (2.7.0)
7+
addressable (2.8.0)
88
public_suffix (>= 2.0.2, < 5.0)
99
coffee-script (2.4.1)
1010
coffee-script-source

‎docs/en/success-guide/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nav_level: 1
88
nav_order: 100
99
---
1010

11-
Version 2.6.2, released 2020-12-04
11+
Version 2.6.3, released 2020-12-04
1212

1313
This document walks you through the steps needed to understand
1414
and setup the User Sync Tool.

‎docs/en/success-guide/test_run.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ These commands ought to produce an output similar to the following:
2727

2828
```
2929
> .\user-sync.exe -v
30-
user-sync.exe 2.6.2
30+
user-sync.exe 2.6.3
3131
```
3232

3333
```

‎docs/en/user-manual/advanced_configuration.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,28 @@ created on those organizations if `auto_create` is enabled.
860860
Refer to [Accessing Users in Other Organizations](https://adobe-apiplatform.github.io/user-sync.py/en/user-manual/advanced_configuration.html#accessing-users-in-other-organizations)
861861
for more information.
862862

863+
## Two-Step Lookup
864+
865+
Some LDAP systems may not support a `memberOf` overlay the way other systems like Active Directory do. This can make it
866+
impossible for the LDAP connector to use its group-based queries to get members for particular groups in an LDAP system.
867+
868+
The `two_steps_lookup` option in `connector-ldap.yml` can be used to overcome this limitation. With two-step lookup
869+
enabled and configured, the sync tool will retrieve group membership from the specified `group_member_attribute_name`
870+
attribute. User metadata from these queries is then verified to be part of the `base_dn` and the full user record is retrieved.
871+
872+
Example:
873+
874+
```yaml
875+
two_steps_lookup:
876+
group_member_attribute_name: "member"
877+
nested_group: False
878+
```
879+
880+
`group_member_attribute_name` defines the user attribute to use for group membership information. `nested_group` will
881+
recursively query nested group memberships.
882+
883+
**NOTE:** `group_member_filter_format` may not be defined when two-step lookup is enabled.
884+
863885
---
864886

865887
[Previous Section](usage_scenarios.md) \| [Next Section](deployment_best_practices.md)

‎docs/en/user-manual/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ nav_level: 1
88
nav_order: 10
99
---
1010

11-
Version 2.6.2, released 2020-09-16
11+
Version 2.6.3, released 2020-09-16
1212

1313
This document has all the information you need to get up and
1414
running with User Sync. It presumes familiarity with the use of

‎user_sync/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
1919
# SOFTWARE.
2020

21-
__version__ = '2.6.2'
21+
__version__ = '2.6.3'

0 commit comments

Comments
 (0)