Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
minirc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Dano Mathis
minirc
Commits
5e0ffa01
Commit
5e0ffa01
authored
5 years ago
by
Olivier Levillain
Browse files
Options
Downloads
Patches
Plain Diff
New command: list.
For admin users, lists all users. For other users, only list connected users.
parent
40284266
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
config.py
+5
-0
5 additions, 0 deletions
config.py
server.py
+15
-0
15 additions, 0 deletions
server.py
test_server.py
+30
-1
30 additions, 1 deletion
test_server.py
with
50 additions
and
1 deletion
config.py
+
5
−
0
View file @
5e0ffa01
...
...
@@ -55,6 +55,11 @@ class UserDB:
except
Exception
:
return
None
def
user_list
(
self
):
result
=
list
(
self
.
users
.
keys
())
result
.
sort
()
return
result
def
load_userdb_from_content
(
content
):
userdb
=
UserDB
()
...
...
This diff is collapsed.
Click to expand it.
server.py
+
15
−
0
View file @
5e0ffa01
...
...
@@ -45,5 +45,20 @@ class Server:
else
:
return
False
,
"
You are not currently logged in
"
elif
command
==
"
list
"
:
if
context
.
current_user
:
logins
=
self
.
users
.
user_list
()
result
=
[]
for
l
in
logins
:
relevant_contexts
=
filter
(
lambda
context
:
context
.
check_current_user
(
l
),
self
.
contexts
)
connected
=
list
(
relevant_contexts
)
!=
[]
if
connected
:
result
.
append
(
"
* %s
"
%
l
)
elif
context
.
current_user
[
'
admin
'
]:
result
.
append
(
"
%s
"
%
l
)
return
True
,
"
\n
"
.
join
(
result
)
else
:
return
False
,
"
You are not currently logged in
"
else
:
return
False
,
"
Invalid command
"
This diff is collapsed.
Click to expand it.
test_server.py
+
30
−
1
View file @
5e0ffa01
...
...
@@ -74,7 +74,6 @@ def test_whoami():
# Invalid command
def
test_invalid_command
():
...
...
@@ -85,3 +84,33 @@ def test_invalid_command():
result
,
answer
=
s
.
execute
(
context
,
"
invalid
"
)
assert
result
==
False
assert
answer
==
"
Invalid command
"
# List
def
test_list_users_from_admin
():
c
=
config
.
Config
()
s
=
server
.
Server
(
c
)
context
=
s
.
new_context
()
result
,
answer
=
s
.
execute
(
context
,
"
login admin admin
"
)
result
,
answer
=
s
.
execute
(
context
,
"
list
"
)
assert
result
==
True
assert
answer
==
"
* admin
\n
guest
"
def
test_list_users_from_guest
():
c
=
config
.
Config
()
s
=
server
.
Server
(
c
)
context
=
s
.
new_context
()
result
,
answer
=
s
.
execute
(
context
,
"
list
"
)
assert
result
==
False
assert
answer
==
"
You are not currently logged in
"
result
,
answer
=
s
.
execute
(
context
,
"
login guest guest
"
)
result
,
answer
=
s
.
execute
(
context
,
"
list
"
)
assert
result
==
True
assert
answer
==
"
* guest
"
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