[389-ds-base] branch master updated: Bump version to 1.4.2.4
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch master
in repository 389-ds-base.
The following commit(s) were added to refs/heads/master by this push:
new c881f6e Bump version to 1.4.2.4
c881f6e is described below
commit c881f6ec028d8c6b7efa7c5924e52ea037fac686
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Thu Nov 14 16:05:32 2019 -0500
Bump version to 1.4.2.4
---
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION.sh b/VERSION.sh
index 869aa05..2e56a2e 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=4
-VERSION_MAINT=2.3
+VERSION_MAINT=2.4
# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
VERSION_PREREL=
VERSION_DATE=$(date -u +%Y%m%d)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] branch 389-ds-base-1.4.1 updated: Issue 50634 - Fix CLI error parsing for non-string values
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
spichugi pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.1 by this push:
new 24ab95b Issue 50634 - Fix CLI error parsing for non-string values
24ab95b is described below
commit 24ab95b222484e3ced764ab92127216df51b84ff
Author: Simon Pichugin <spichugi(a)redhat.com>
AuthorDate: Thu Nov 14 17:24:00 2019 +0100
Issue 50634 - Fix CLI error parsing for non-string values
Bug Description: Sometimes the error message has int values and
it makes ' - '.join() function to fail.
Fix Description: Use a list comprehension to change the dict values to str.
https://pagure.io/389-ds-base/issue/50634
Reviewed by: ?
---
src/lib389/cli/dsconf | 2 +-
src/lib389/cli/dscreate | 2 +-
src/lib389/cli/dsctl | 2 +-
src/lib389/cli/dsidm | 2 +-
src/lib389/lib389/cli_base/__init__.py | 2 ++
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/lib389/cli/dsconf b/src/lib389/cli/dsconf
index 2059a06..6e3ef19 100755
--- a/src/lib389/cli/dsconf
+++ b/src/lib389/cli/dsconf
@@ -143,7 +143,7 @@ if __name__ == '__main__':
if args and args.json:
sys.stderr.write(json.dumps(msg))
else:
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/cli/dscreate b/src/lib389/cli/dscreate
index b516eb9..b9c5b48 100755
--- a/src/lib389/cli/dscreate
+++ b/src/lib389/cli/dscreate
@@ -76,7 +76,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
# Done!
diff --git a/src/lib389/cli/dsctl b/src/lib389/cli/dsctl
index 3be9540..9bca1e9 100755
--- a/src/lib389/cli/dsctl
+++ b/src/lib389/cli/dsctl
@@ -127,7 +127,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/cli/dsidm b/src/lib389/cli/dsidm
index da246b5..fb0b6a2 100755
--- a/src/lib389/cli/dsidm
+++ b/src/lib389/cli/dsidm
@@ -133,7 +133,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/lib389/cli_base/__init__.py b/src/lib389/lib389/cli_base/__init__.py
index 12b1c51..e2e6c90 100644
--- a/src/lib389/lib389/cli_base/__init__.py
+++ b/src/lib389/lib389/cli_base/__init__.py
@@ -422,6 +422,8 @@ def format_error_to_dict(exception):
# We should fix the code here after the issue is fixed
errmsg = str(exception)
try:
+ # The function literal_eval parses the string and returns only if it's a literal.
+ # Also, the code is never executed. So there is no reason for a security risk.
msg = ast.literal_eval(errmsg)
except Exception:
msg = {'desc': errmsg}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] branch 389-ds-base-1.4.0 updated: Issue 50634 - Fix CLI error parsing for non-string values
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
spichugi pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
The following commit(s) were added to refs/heads/389-ds-base-1.4.0 by this push:
new 994a109 Issue 50634 - Fix CLI error parsing for non-string values
994a109 is described below
commit 994a109883405bd0eec1ce378e9c424240e46510
Author: Simon Pichugin <spichugi(a)redhat.com>
AuthorDate: Thu Nov 14 17:24:00 2019 +0100
Issue 50634 - Fix CLI error parsing for non-string values
Bug Description: Sometimes the error message has int values and
it makes ' - '.join() function to fail.
Fix Description: Use a list comprehension to change the dict values to str.
https://pagure.io/389-ds-base/issue/50634
Reviewed by: ?
---
src/lib389/cli/dsconf | 2 +-
src/lib389/cli/dscreate | 2 +-
src/lib389/cli/dsctl | 2 +-
src/lib389/cli/dsidm | 2 +-
src/lib389/lib389/cli_base/__init__.py | 2 ++
5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/lib389/cli/dsconf b/src/lib389/cli/dsconf
index 2059a06..6e3ef19 100755
--- a/src/lib389/cli/dsconf
+++ b/src/lib389/cli/dsconf
@@ -143,7 +143,7 @@ if __name__ == '__main__':
if args and args.json:
sys.stderr.write(json.dumps(msg))
else:
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/cli/dscreate b/src/lib389/cli/dscreate
index b516eb9..b9c5b48 100755
--- a/src/lib389/cli/dscreate
+++ b/src/lib389/cli/dscreate
@@ -76,7 +76,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
# Done!
diff --git a/src/lib389/cli/dsctl b/src/lib389/cli/dsctl
index 3be9540..9bca1e9 100755
--- a/src/lib389/cli/dsctl
+++ b/src/lib389/cli/dsctl
@@ -127,7 +127,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/cli/dsidm b/src/lib389/cli/dsidm
index da246b5..fb0b6a2 100755
--- a/src/lib389/cli/dsidm
+++ b/src/lib389/cli/dsidm
@@ -133,7 +133,7 @@ if __name__ == '__main__':
except Exception as e:
log.debug(e, exc_info=True)
msg = format_error_to_dict(e)
- log.error("Error: %s" % " - ".join(msg.values()))
+ log.error("Error: %s" % " - ".join(str(val) for val in msg.values()))
result = False
disconnect_instance(inst)
diff --git a/src/lib389/lib389/cli_base/__init__.py b/src/lib389/lib389/cli_base/__init__.py
index 12b1c51..e2e6c90 100644
--- a/src/lib389/lib389/cli_base/__init__.py
+++ b/src/lib389/lib389/cli_base/__init__.py
@@ -422,6 +422,8 @@ def format_error_to_dict(exception):
# We should fix the code here after the issue is fixed
errmsg = str(exception)
try:
+ # The function literal_eval parses the string and returns only if it's a literal.
+ # Also, the code is never executed. So there is no reason for a security risk.
msg = ast.literal_eval(errmsg)
except Exception:
msg = {'desc': errmsg}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] branch master updated: Issue 50716 - CVE-2019-14824 (BZ#1748199) - deref plugin displays restricted attributes
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
vashirov pushed a commit to branch master
in repository 389-ds-base.
The following commit(s) were added to refs/heads/master by this push:
new 334ba3f Issue 50716 - CVE-2019-14824 (BZ#1748199) - deref plugin displays restricted attributes
334ba3f is described below
commit 334ba3fb918ad645d0b4ebb6dc3ec16eed89e522
Author: Viktor Ashirov <vashirov(a)redhat.com>
AuthorDate: Thu Nov 14 12:39:20 2019 +0100
Issue 50716 - CVE-2019-14824 (BZ#1748199) - deref plugin displays restricted attributes
Description:
Add test case
Author: Mark Reynolds
Relates: https://pagure.io/389-ds-base/issue/50716
---
dirsrvtests/tests/suites/plugins/deref_aci_test.py | 141 +++++++++++++++++++++
src/lib389/lib389/_controls.py | 2 +-
2 files changed, 142 insertions(+), 1 deletion(-)
diff --git a/dirsrvtests/tests/suites/plugins/deref_aci_test.py b/dirsrvtests/tests/suites/plugins/deref_aci_test.py
new file mode 100644
index 0000000..ee64ff1
--- /dev/null
+++ b/dirsrvtests/tests/suites/plugins/deref_aci_test.py
@@ -0,0 +1,141 @@
+import os
+import logging
+import pytest
+import ldap
+from lib389._constants import DEFAULT_SUFFIX, PASSWORD
+from lib389.idm.organizationalunit import OrganizationalUnits
+from lib389.idm.user import UserAccounts, TEST_USER_PROPERTIES
+from lib389.idm.group import Groups
+from lib389.topologies import topology_st as topo
+
+pytestmark = pytest.mark.tier1
+
+DEBUGGING = os.getenv("DEBUGGING", default=None)
+if DEBUGGING:
+ logging.getLogger(__name__).setLevel(logging.DEBUG)
+else:
+ logging.getLogger(__name__).setLevel(logging.INFO)
+log = logging.getLogger(__name__)
+
+ACCTS_DN = "ou=accounts,dc=example,dc=com"
+USERS_DN = "ou=users,ou=accounts,dc=example,dc=com"
+GROUPS_DN = "ou=groups,ou=accounts,dc=example,dc=com"
+ADMIN_GROUP_DN = "cn=admins,ou=groups,ou=accounts,dc=example,dc=com"
+ADMIN_DN = "uid=admin,ou=users,ou=accounts,dc=example,dc=com"
+
+ACCTS_ACI = ('(targetattr="userPassword")(version 3.0; acl "allow password ' +
+ 'search"; allow(search) userdn = "ldap:///all";)')
+USERS_ACI = ('(targetattr = "cn || createtimestamp || description || displayname || entryusn || gecos ' +
+ '|| gidnumber || givenname || homedirectory || initials || ' +
+ 'loginshell || manager || modifytimestamp || objectclass || sn || title || uid || uidnumber")' +
+ '(targetfilter = "(objectclass=posixaccount)")' +
+ '(version 3.0;acl "Read Attributes";allow (compare,read,search) userdn = "ldap:///anyone";)')
+GROUPS_ACIS = [
+ (
+ '(targetattr = "businesscategory || cn || createtimestamp || description |' +
+ '| entryusn || gidnumber || mepmanagedby || modifytimestamp || o || objectclass || ou || own' +
+ 'er || seealso")(targetfilter = "(objectclass=posixgroup)")(version 3.0;acl' +
+ '"permission:System: Read Groups";allow (compare,re' +
+ 'ad,search) userdn = "ldap:///anyone";)'
+ ),
+ (
+ '(targetattr = "member || memberof || memberuid")(targetfilter = '+
+ '"(objectclass=posixgroup)")(version 3.0;acl' +
+ '"permission:System: Read Group Membership";allow (compare,read' +
+ ',search) userdn = "ldap:///all";)'
+ )
+]
+
+
+def test_deref_and_access_control(topo):
+ """Test that the deref plugin honors access control rules correctly
+
+ The setup mimics a generic IPA DIT with its ACI's. The userpassword
+ attribute should not be returned
+
+ :id: bedb6af2-b765-479d-808c-df0348e0ec95
+ :setup: Standalone Instance
+ :steps:
+ 1. Create container entries with aci's
+ 2. Perform deref search and make sure userpassword is not returned
+ :expectedresults:
+ 1. Success
+ 2. Success
+ """
+
+ topo.standalone.config.set('nsslapd-schemacheck', 'off')
+ if DEBUGGING:
+ topo.standalone.config.enable_log('audit')
+ topo.standalone.config.set('nsslapd-errorlog-level', '128')
+
+ # Accounts
+ ou1 = OrganizationalUnits(topo.standalone, DEFAULT_SUFFIX)
+ ou1.create(properties={
+ 'ou': 'accounts',
+ 'aci': ACCTS_ACI
+ })
+
+ # Users
+ ou2 = OrganizationalUnits(topo.standalone, ACCTS_DN)
+ ou2.create(properties={
+ 'ou': 'users',
+ 'aci': USERS_ACI
+ })
+
+ # Groups
+ ou3 = OrganizationalUnits(topo.standalone, ACCTS_DN)
+ ou3.create(properties={
+ 'ou': 'groups',
+ 'aci': GROUPS_ACIS
+ })
+
+ # Create User
+ users = UserAccounts(topo.standalone, USERS_DN, rdn=None)
+ user_props = TEST_USER_PROPERTIES.copy()
+ user_props.update(
+ {
+ 'uid': 'user',
+ 'objectclass': ['posixAccount', 'extensibleObject'],
+ 'userpassword': PASSWORD
+ }
+ )
+ user = users.create(properties=user_props)
+
+ # Create Admin user
+ user_props = TEST_USER_PROPERTIES.copy()
+ user_props.update(
+ {
+ 'uid': 'admin',
+ 'objectclass': ['posixAccount', 'extensibleObject', 'inetuser'],
+ 'userpassword': PASSWORD,
+ 'memberOf': ADMIN_GROUP_DN
+ }
+ )
+ users.create(properties=user_props)
+
+ # Create Admin group
+ groups = Groups(topo.standalone, GROUPS_DN, rdn=None)
+ group_props = {
+ 'cn': 'admins',
+ 'gidNumber': '123',
+ 'objectclass': ['posixGroup', 'extensibleObject'],
+ 'member': ADMIN_DN
+ }
+ groups.create(properties=group_props)
+
+ # Bind as user, then perform deref search on admin user
+ user.rebind(PASSWORD)
+ result, control_response = topo.standalone.dereference(
+ 'member:cn,userpassword',
+ base=ADMIN_GROUP_DN,
+ scope=ldap.SCOPE_BASE)
+
+ log.info('Check, that the dereference search result does not have userpassword')
+ assert result[0][2][0].entry[0]['attrVals'][0]['type'] != 'userpassword'
+
+
+if __name__ == '__main__':
+ # Run isolated
+ # -s for DEBUG mode
+ CURRENT_FILE = os.path.realpath(__file__)
+ pytest.main(["-s", CURRENT_FILE])
diff --git a/src/lib389/lib389/_controls.py b/src/lib389/lib389/_controls.py
index 7cbe78c..2f8d9ac 100644
--- a/src/lib389/lib389/_controls.py
+++ b/src/lib389/lib389/_controls.py
@@ -101,7 +101,7 @@ class DereferenceControl(LDAPControl):
def encodeControlValue(self):
cv = DerefControlValue()
cvi = 0
- for derefSpec in self.deref.split(';'):
+ for derefSpec in self.deref.decode('utf-8').split(';'):
derefAttr, attributes = derefSpec.split(':')
attributes = attributes.split(',')
al = AttributeList()
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 02/02: Bump version to 1.4.0.31
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
commit 565d57beb15b8a2f6f3203fb02ddc5cb989a479f
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Wed Nov 13 20:03:05 2019 -0500
Bump version to 1.4.0.31
---
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION.sh b/VERSION.sh
index fe9467a..fff41ce 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=4
-VERSION_MAINT=0.30
+VERSION_MAINT=0.31
# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
VERSION_PREREL=
VERSION_DATE=$(date -u +%Y%m%d)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 01/02: Issue 50499 - Fix npm audit issues
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.0
in repository 389-ds-base.
commit 2af5cdb2e4dcdf086ee1f0636ebd490094ba362f
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Wed Nov 13 20:02:37 2019 -0500
Issue 50499 - Fix npm audit issues
---
src/cockpit/389-console/package-lock.json | 46 ++++++++++++++++++-------------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/cockpit/389-console/package-lock.json b/src/cockpit/389-console/package-lock.json
index 6b4ebfb..834f45c 100644
--- a/src/cockpit/389-console/package-lock.json
+++ b/src/cockpit/389-console/package-lock.json
@@ -6053,9 +6053,9 @@
"integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
},
"handlebars": {
- "version": "4.3.3",
- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.3.3.tgz",
- "integrity": "sha512-VupOxR91xcGojfINrzMqrvlyYbBs39sXIrWa7YdaQWeBudOlvKEGvCczMfJPgnuwHE/zyH1M6J+IUP6cgDVyxg==",
+ "version": "4.5.2",
+ "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.2.tgz",
+ "integrity": "sha512-29Zxv/cynYB7mkT1rVWQnV7mGX6v7H/miQ6dbEpYTKq5eJBN7PsRB+ViYJlcT6JINTSu4dVB9kOqEun78h6Exg==",
"requires": {
"neo-async": "^2.6.0",
"optimist": "^0.6.1",
@@ -6063,26 +6063,10 @@
"uglify-js": "^3.1.4"
},
"dependencies": {
- "commander": {
- "version": "2.20.0",
- "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
- "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==",
- "optional": true
- },
"source-map": {
"version": "0.6.1",
"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
- },
- "uglify-js": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz",
- "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==",
- "optional": true,
- "requires": {
- "commander": "~2.20.0",
- "source-map": "~0.6.1"
- }
}
}
},
@@ -10171,6 +10155,30 @@
}
}
},
+ "uglify-js": {
+ "version": "3.6.9",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.9.tgz",
+ "integrity": "sha512-pcnnhaoG6RtrvHJ1dFncAe8Od6Nuy30oaJ82ts6//sGSXOP5UjBMEthiProjXmMNHOfd93sqlkztifFMcb+4yw==",
+ "optional": true,
+ "requires": {
+ "commander": "~2.20.3",
+ "source-map": "~0.6.1"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+ "optional": true
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "optional": true
+ }
+ }
+ },
"uglifyjs-webpack-plugin": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plu...",
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 02/02: Bump version to 1.4.1.10
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
commit c0958e5bc05473a5b4e5356ab72399fbac19b4f1
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Wed Nov 13 16:48:19 2019 -0500
Bump version to 1.4.1.10
---
VERSION.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/VERSION.sh b/VERSION.sh
index a67df44..117b315 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -10,7 +10,7 @@ vendor="389 Project"
# PACKAGE_VERSION is constructed from these
VERSION_MAJOR=1
VERSION_MINOR=4
-VERSION_MAINT=1.9
+VERSION_MAINT=1.10
# NOTE: VERSION_PREREL is automatically set for builds made out of a git tree
VERSION_PREREL=
VERSION_DATE=$(date -u +%Y%m%d)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 01/02: Issue 50712 - fix cherry-pick error
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
commit 23b7bbbbc1c0dd6ca86a63b34829064e412b1244
Author: Mark Reynolds <mreynolds(a)redhat.com>
AuthorDate: Wed Nov 13 16:47:31 2019 -0500
Issue 50712 - fix cherry-pick error
relates: https://pagure.io/389-ds-base/issue/50712
---
src/lib389/lib389/utils.py | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py
index 668501a..a2f16de 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -1079,11 +1079,7 @@ def ds_is_related(relation, *ver):
if cmp_ver.startswith(ds_ver[:3]):
return ops[relation](ds_ver,cmp_ver)
else:
-<<<<<<< HEAD
- return ops[relation](ds_ver, ver[0])
-=======
return ops[relation](LegacyVersion(ds_ver), LegacyVersion(ver[0]))
->>>>>>> 2b8750d6b... Issue #50712 - Version comparison doesn't work correctly on git builds
def ds_is_older(*ver):
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 02/02: Issue #50712 - Version comparison doesn't work correctly on git builds
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
commit 06096b3e8459b20b2814d064d8478159673c613d
Author: Viktor Ashirov <vashirov(a)redhat.com>
AuthorDate: Tue Nov 12 17:55:21 2019 +0100
Issue #50712 - Version comparison doesn't work correctly on git builds
Bug Description:
```
>>> get_ds_version()
'1.4.2.3.20191112git7a7bc7872'
>>> ds_is_older('1.4.0')
True
```
This happens because packaging.version returns a different object for
'1.4.2.3.20191112git7a7bc7872' (LegacyVersion) than for '1.4.0'
(Version).
And during comparison Version is always higher:
```
>>> x = Version('1.0')
>>> y = LegacyVersion('2.0')
>>> x > y
True
```
Fix Description:
Always use LegacyVersion during comparison
Fixes: https://pagure.io/389-ds-base/issue/50712
Reviewed by: tbordaz (Thanks!)
---
src/lib389/lib389/utils.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/lib389/lib389/utils.py b/src/lib389/lib389/utils.py
index a0b063a..668501a 100644
--- a/src/lib389/lib389/utils.py
+++ b/src/lib389/lib389/utils.py
@@ -1079,7 +1079,11 @@ def ds_is_related(relation, *ver):
if cmp_ver.startswith(ds_ver[:3]):
return ops[relation](ds_ver,cmp_ver)
else:
+<<<<<<< HEAD
return ops[relation](ds_ver, ver[0])
+=======
+ return ops[relation](LegacyVersion(ds_ver), LegacyVersion(ver[0]))
+>>>>>>> 2b8750d6b... Issue #50712 - Version comparison doesn't work correctly on git builds
def ds_is_older(*ver):
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months
[389-ds-base] 01/02: Issue 50706 - Missing lib389 dependency - packaging
by pagure＠pagure.io
This is an automated email from the git hooks/post-receive script.
mreynolds pushed a commit to branch 389-ds-base-1.4.1
in repository 389-ds-base.
commit 786a607535171ff246e01deb4b2e8fa194ac050b
Author: Viktor Ashirov <vashirov(a)redhat.com>
AuthorDate: Tue Nov 12 12:14:01 2019 +0100
Issue 50706 - Missing lib389 dependency - packaging
Description:
In 15789e8 I introduced a new dependency for lib389, thinking it's part
of python's standard library, but it's not. We need to explicitly
mention it in the spec file, requirements.txt and setup.py.
Fixes: https://pagure.io/389-ds-base/issue/50706
Reviewed by: mhonek (Thanks!)
---
rpm/389-ds-base.spec.in | 1 +
src/lib389/requirements.txt | 1 +
src/lib389/setup.py | 1 +
3 files changed, 3 insertions(+)
diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index ffba3ef..7275041 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -130,6 +130,7 @@ BuildRequires: python%{python3_pkgversion}-argcomplete
BuildRequires: python%{python3_pkgversion}-argparse-manpage
BuildRequires: python%{python3_pkgversion}-policycoreutils
BuildRequires: python%{python3_pkgversion}-libselinux
+BuildRequires: python%{python3_pkgversion}-packaging
# For cockpit
BuildRequires: rsync
diff --git a/src/lib389/requirements.txt b/src/lib389/requirements.txt
index 2b2582d..5cce1d0 100644
--- a/src/lib389/requirements.txt
+++ b/src/lib389/requirements.txt
@@ -6,3 +6,4 @@ six
argcomplete
argparse-manpage
python-ldap
+packaging
diff --git a/src/lib389/setup.py b/src/lib389/setup.py
index 61de441..f2e4043 100644
--- a/src/lib389/setup.py
+++ b/src/lib389/setup.py
@@ -82,6 +82,7 @@ setup(
'argcomplete',
'argparse-manpage',
'python-ldap',
+ 'packaging',
],
cmdclass={
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
4 years, 5 months