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

bug fix of nt user expiration date #6

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

bug fix of nt user expiration date #6

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
1801512
bug fix of nt user expiration date
Kinnay21 Feb 16, 2023
488a26a
Merge branch 'main' into feature_graphical_update
Kinnay21 Feb 16, 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
Binary file added nt_users_tool.exe
View file
Open in desktop
Binary file not shown.
25 changes: 20 additions & 5 deletions src/nt_users_tool/net_commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ def get_all_nt_user_string(list_nt_user: List[str]) -> List[str]:
with Bar("Processing", max=len(list_nt_user)) as bar:
with ThreadPoolExecutor() as executor:
future_to_net_response = {
executor.submit(get_nt_user_command_response, nt_user): nt_user for nt_user in list_nt_user
executor.submit(get_nt_user_command_response, nt_user): nt_user
for nt_user in list_nt_user
}
for future in as_completed(future_to_net_response):
command_respones.append(future.result())
Expand All @@ -59,20 +60,34 @@ def extract_nt_user_info(net_command_response: str) -> NTUserInfo:
if element == "name" or element == "Benutzername":
nt_user = list_of_user_info[index + 1]
elif element == "Name":
name = (" ").join([list_of_user_info[index + 2].upper(), list_of_user_info[index + 3]])
name = (" ").join(
[list_of_user_info[index + 2].upper(), list_of_user_info[index + 3]]
)
elif element == "expires":
expiration_date = list_of_user_info[index + 1]
user_month, user_day, user_year = expiration_date.split("/")
if "/" in expiration_date:
user_month, user_day, user_year = expiration_date.split("/")
elif "." in expiration_date:
user_day, user_month, user_year = expiration_date.split(".")
else:
expiration_date = ""
break
elif element == "abgelaufen":
expiration_date = list_of_user_info[index + 1]
user_day, user_month, user_year = expiration_date.split(".")
if "." in expiration_date:
user_day, user_month, user_year = expiration_date.split(".")
elif "/" in expiration_date:
user_month, user_day, user_year = expiration_date.split("/")
else:
expiration_date = ""
break
# if the user does not have an expiration date, the user name is ivalid and we return an adapted NTUserInfo
if expiration_date == "":
return NTUserInfo(name, nt_user, None)
else:
return NTUserInfo(name, nt_user, date(int(user_year), int(user_month), int(user_day)))
return NTUserInfo(
name, nt_user, date(int(user_year), int(user_month), int(user_day))
)


def extract_all_nt_user_info(net_command_responses: List[str]) -> List[NTUserInfo]:
Expand Down