Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dm-docs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hammonds
dm-docs
Commits
4c7b7fbd
Commit
4c7b7fbd
authored
9 years ago
by
sveseli
Browse files
Options
Downloads
Patches
Plain Diff
final fixes for resolving globus online auth issue
parent
38985649
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
doc/RELEASE_NOTES.txt
+1
-0
1 addition, 0 deletions
doc/RELEASE_NOTES.txt
src/python/dm/common/utility/ldapLinuxPlatformUtility.py
+7
-6
7 additions, 6 deletions
src/python/dm/common/utility/ldapLinuxPlatformUtility.py
with
8 additions
and
6 deletions
doc/RELEASE_NOTES.txt
+
1
−
0
View file @
4c7b7fbd
...
...
@@ -5,6 +5,7 @@ Release 0.8 (01/26/2016)
processed; for uploads system can detect files that had been processed
already; improved handling and reporting of processing errors)
- Source file checksum is calculated for rsync/gridftp plugins by default
- Resolved globus online user authorization delay issue
Release 0.7 (12/08/2015)
=============================
...
...
This diff is collapsed.
Click to expand it.
src/python/dm/common/utility/ldapLinuxPlatformUtility.py
+
7
−
6
View file @
4c7b7fbd
...
...
@@ -44,13 +44,14 @@ class LdapLinuxPlatformUtility:
if
not
self
.
adminPassword
:
raise
ConfigurationError
(
'
LDAP password could not be found in %s file
'
%
adminPasswordFile
)
self
.
ldapClient
=
None
self
.
__configure
()
def
__configure
(
self
):
cm
=
ConfigurationManager
.
getInstance
()
configItems
=
cm
.
getConfigItems
(
LdapLinuxPlatformUtility
.
CONFIG_SECTION_NAME
)
self
.
l
ogger
.
debug
(
'
Got config items: %s
'
%
configItems
)
self
.
getL
ogger
()
.
debug
(
'
Got config items: %s
'
%
configItems
)
self
.
refreshAuthFilesCommand
=
cm
.
getConfigOption
(
LdapLinuxPlatformUtility
.
CONFIG_SECTION_NAME
,
LdapLinuxPlatformUtility
.
REFRESH_AUTH_FILES_COMMAND_KEY
)
self
.
l
ogger
.
debug
(
'
Refresh auth files command: %s
'
%
self
.
refreshAuthFilesCommand
)
self
.
getL
ogger
()
.
debug
(
'
Refresh auth files command: %s
'
%
self
.
refreshAuthFilesCommand
)
@classmethod
def
getLogger
(
cls
):
...
...
@@ -325,7 +326,7 @@ class LdapLinuxPlatformUtility:
logger
=
self
.
getLogger
()
try
:
logger
.
debug
(
'
Refreshing auth files
'
)
self
.
executeCommand
(
self
.
refreshAuthFilesCommand
:
)
self
.
executeCommand
(
self
.
refreshAuthFilesCommand
)
except
Exception
,
ex
:
logger
.
warn
(
'
Failed to refresh auth files: %s
'
%
(
str
(
ex
)))
...
...
@@ -334,9 +335,9 @@ class LdapLinuxPlatformUtility:
if
__name__
==
'
__main__
'
:
utility
=
LdapLinuxPlatformUtility
(
'
ldaps://dmid-vm.xray.aps.anl.gov:636
'
,
'
uid=dmadmin,ou=People,o=aps.anl.gov,dc=aps,dc=anl,dc=gov
'
,
'
/tmp/ldapPassword
'
,
groupDnFormat
=
'
cn=%s,ou=DM,ou=Group,o=aps.anl.gov,dc=aps,dc=anl,dc=gov
'
,
minGidNumber
=
66000
)
print
utility
.
getGroupInfo
(
u
'
id
8i
-test0
2
'
)
utility
.
addLocalUserToGroup
(
u
'
sveseli
'
,
u
'
id8i-test02
'
)
print
utility
.
getGroupInfo
(
u
'
id8i-test02
'
)
print
utility
.
getGroupInfo
(
u
'
s1
id-test0
3
'
)
#
utility.addLocalUserToGroup(u'sveseli', u'id8i-test02')
#
print utility.getGroupInfo(u'id8i-test02')
#utility.deleteLocalUserFromGroup(u'sveseli', u'id8i-test02')
#print utility.getGroupInfo(u'id8i-test02')
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment