Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement System Users & Groups #13

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implement System Users & Groups #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
deb3678
Implement System Users & Groups
itzwam Sep 13, 2023
52ace33
BBCode
itzwam Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pf_focus/bbcode.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,18 @@ def output_bbcode(doc, stream):
output_bbcode_table(stream, ('Option', 'Value'), info.items())
stream.write("\n")

stream.write("### Groups\n")
groups = sorted(doc.pfsense.system.group.data, key=lambda group: group['gid'])
groups = [dict_to_list(group, ('name', 'gid', 'description', 'member')) for group in groups]
output_bbcode_table(stream, ('Name', 'Group ID', 'Description', 'Members #'), groups)
stream.write("\n")

stream.write("### Users\n")
users = sorted(doc.pfsense.system.user.data, key=lambda user: user['uid'])
users = [dict_to_list(user, ('name', 'uid', 'descr', 'scope', 'groupname')) for user in users]
output_bbcode_table(stream, ('Name', 'User ID', 'Description', 'Scope', 'Group'), users)
stream.write("\n")

if hasattr_r(doc.pfsense, 'interfaces'):
stream.write(h2("Interfaces\n"))
interfaces = sorted(doc.pfsense.interfaces.data.items(), key=lambda interface: interface[0])
Expand Down
12 changes: 12 additions & 0 deletions pf_focus/markdown.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,18 @@ def output_markdown(doc, stream):
output_markdown_table(stream, ('Option', 'Value'), info.items())
stream.write("\n")

stream.write("### Groups\n")
groups = sorted(doc.pfsense.system.group.data, key=lambda group: group['gid'])
groups = [dict_to_list(group, ('name', 'gid', 'description', 'member')) for group in groups]
output_markdown_table(stream, ('Name', 'Group ID', 'Description', 'Members #'), groups)
stream.write("\n")

stream.write("### Users\n")
users = sorted(doc.pfsense.system.user.data, key=lambda user: user['uid'])
users = [dict_to_list(user, ('name', 'uid', 'descr', 'scope', 'groupname')) for user in users]
output_markdown_table(stream, ('Name', 'User ID', 'Description', 'Scope', 'Group'), users)
stream.write("\n")

if hasattr_r(doc.pfsense, 'interfaces'):
stream.write("## Interfaces\n")
interfaces = sorted(doc.pfsense.interfaces.data.items(), key=lambda interface: interface[0])
Expand Down
16 changes: 16 additions & 0 deletions pf_focus/pfsense.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,20 @@ class PfSenseSyslog(PfSenseNode):
_logall = PfSenseFlag
_enable = PfSenseFlag

class PfSenseUser(PfSenseNode):
_name = PfSenseString
_descr = PfSenseString
_scope = PfSenseString
_groupname = PfSenseString
_uid = PfSenseInteger
# _member = PfSenseString

class PfSenseGroup(PfSenseNode):
_name = PfSenseString
_gid = PfSenseInteger
_description = PfSenseString
_member = PfSenseString

class PfSenseSystem(PfSenseNode):
_optimization = PfSenseString
_hostname = PfSenseString
Expand All @@ -394,6 +408,8 @@ class PfSenseSystem(PfSenseNode):
_timezone = PfSenseString
_language = PfSenseString
_dnsserver = [PfSenseString]
_group = [PfSenseGroup]
_user = [PfSenseUser]

class PfSenseConfig(PfSenseNode):
_version = PfSenseString
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ def read_file(filename):

setup(
name='pfFocus',
version='0.1',
version='0.2',
description='Generate meaningful output from your pfSense configuration backup',
long_description=read_file('README.md'),
long_description_content_type='text/markdown',
Expand Down