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

Displaying date with ET as timezone and reverting some timezone changes. #7

Merged
merged 2 commits into from
Jan 6, 2020
Merged

Displaying date with ET as timezone and reverting some timezone changes. #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efcfd35
Update mixins.py
Ankitashinde0 Jan 6, 2020
527dcdb
Update mixins.py
Ankitashinde0 Jan 6, 2020
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
38 changes: 15 additions & 23 deletions src/auditlog/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,23 +34,14 @@ def disp_remote_addr(self,obj):

class LogEntryAdminMixin(object):

#GEOIP API used to get user location details.
headers = {
'accept': "application/json",
'content-type': "application/json"
}
response = requests.request("GET", settings.AUDITLOG_GOIP_API, headers=headers)
response_dict = json.loads(response.text) #converting response to dictionary
tz_from_response = response_dict["time_zone"]

def created(self, obj):
new_ts = obj.timestamp.strftime("%m/%d/%Y %I:%M %p")
new_ts = obj.timestamp.strptime(new_ts,"%m/%d/%Y %I:%M %p")
system_tz = pytz.timezone(settings.TIME_ZONE)
local_tz = pytz.timezone(LogEntryAdminMixin.tz_from_response) #local tz set as timezone from response
local_ts = system_tz.localize(new_ts).astimezone(local_tz) #returns datetime in the local timezone
local_tz = pytz.timezone('US/Eastern') #local tz set as ET
local_ts = system_tz.localize(new_ts).astimezone(local_tz) #returns datetime in the ET timezone
local_ts = local_ts.strftime("%m/%d/%Y %I:%M %p")
return local_ts
return (local_ts +" ET")
created.short_description = 'Date'

def entity_type(self,obj):
Expand Down Expand Up @@ -116,18 +107,19 @@ def msg(self, obj):
value = [i, field] + (['***', '***'] if field == 'password' or field == 'kaseya_password' or field == 'webroot_password' or field == 'db_password' or field == 'nlm_server_password' else changes[field]) #to display values of password fields as ****
#changes for last_login field in logging entries
if field == 'last_login':
for i in range(len(changes[field])): #iterating list
for i in changes[field]:
for i in range(len(changes[field])):
system_tz = pytz.timezone(settings.TIME_ZONE)
local_tz = pytz.timezone(LogEntryAdminMixin.tz_from_response) #local tz set as timezone from response
ologin_date = changes[field][0] #storing value at index 0 as old login date
ologin_date = datetime.datetime.strptime(ologin_date, "%Y-%m-%d %H:%M:%S.%f") #from str to dt obj
local_ologin_date = system_tz.localize(ologin_date).astimezone(local_tz) #returns datetime in the local timezone
local_ologin_date = local_ologin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
nlogin_date = changes[field][1] #storing value at index 0 as old login date
nlogin_date = datetime.datetime.strptime(nlogin_date, "%Y-%m-%d %H:%M:%S.%f") #from str to dt obj
local_nlogin_date = system_tz.localize(nlogin_date).astimezone(local_tz) #returns datetime in the local timezone
local_nlogin_date = local_nlogin_date.strftime("%m/%d/%Y %I:%M %p") #converting date into string type
value = [i,field] + [local_ologin_date,local_nlogin_date]
local_tz = pytz.timezone('US/Eastern') #local tz set as ET timezone
ologin_date = changes[field][0]
ologin_date = datetime.datetime.strptime(ologin_date, '%Y-%m-%d %H:%M:%S.%f')
local_ologin_date = system_tz.localize(ologin_date).astimezone(local_tz) #returns datetime in the ET timezone
local_ologin_date = local_ologin_date.strftime("%m/%d/%Y %I:%M %p")
nlogin_date = changes[field][1]
nlogin_date = datetime.datetime.strptime(nlogin_date, '%Y-%m-%d %H:%M:%S.%f')
local_nlogin_date = system_tz.localize(nlogin_date).astimezone(local_tz) #returns datetime in the ET timezone
local_nlogin_date = local_nlogin_date.strftime("%m/%d/%Y %I:%M %p")
value = [i,field] + [local_ologin_date + " ET ",local_nlogin_date + " ET"]
msg += '<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>' % tuple(value)
msg += '</table>'
return mark_safe(msg) #mark_safe is used to return html code in Python
Expand Down