Skip to content

Fix: ml-155 encrypt email with aes-key #1328

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

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

Fix: ml-155 encrypt email with aes-key #1328

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17c104c
fix: added displayEmail field with AES_KEY encryption into user model
Damirkhon Dec 5, 2022
775519b
reverting user model
Damirkhon Dec 6, 2022
638a785
adding displayEmail field with AES_key encryption
Damirkhon Dec 6, 2022
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
10 changes: 7 additions & 3 deletions girderformindlogger/models/user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def initialize(self):
}, language='none')
self.exposeFields(level=AccessType.READ, fields=(
'_id', 'login', 'public', 'displayName', 'firstName', 'lastName',
'admin', 'email', 'created'))
'admin', 'email', 'created', 'displayEmail'))
self.exposeFields(level=AccessType.ADMIN, fields=(
'size', 'status', 'emailVerified', 'creatorId'))

Expand All @@ -55,7 +55,8 @@ def initialize(self):
self.initAES([
('firstName', 64),
('lastName', 64),
('displayName', 64)
('displayName', 64),
('displayEmail', 64)
])

events.bind('model.user.save.created',
Expand Down Expand Up @@ -508,7 +509,9 @@ def createUser(self, login, password, displayName="", email="",
} for gi in list(Group().find(query={"queue": email}))
] if len(email) else [],
'email_encrypted': encryptEmail,
'accountName': ''
'accountName': '',
'displayEmail': email,

}
if encryptEmail:
if len(email) == 0 or not mail_utils.validateEmailAddress(email):
Expand Down Expand Up @@ -847,3 +850,4 @@ def get_users_by_ids(self, user_ids):
'timezone', 'deviceId'
]
)