github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve robustness of email validation

Browse source
This commit is contained in:
James Allen 2018-06-11 15:22:42 +01:00
parent ed5bc70350
commit dbd6ea30e9
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee
View file

@ -4,11 +4,14 @@ TeamInvitesHandler = require('./TeamInvitesHandler')
AuthenticationController = require("../Authentication/AuthenticationController")
SubscriptionLocator = require("./SubscriptionLocator")
ErrorController = require("../Errors/ErrorController")
EmailHelper = require("../Helpers/EmailHelper")
module.exports =
createInvite: (req, res, next) ->
teamManagerId = AuthenticationController.getLoggedInUserId(req)
email = req.body.email
email = EmailHelper.parseEmail(req.body.email)
if !email?
return res.sendStatus(400)
TeamInvitesHandler.createInvite teamManagerId, email, (err, invite) ->
return next(err) if err?
@ -45,8 +48,10 @@ module.exports =
res.sendStatus 204
revokeInvite: (req, res) ->
email = req.params.email
email = EmailHelper.parseEmail(req.params.email)
teamManagerId = AuthenticationController.getLoggedInUserId(req)
if !email?
return res.sendStatus(400)
TeamInvitesHandler.revokeInvite teamManagerId, email, (err, results) ->
return next(err) if err?

14
services/web/app/coffee/Features/Subscription/TeamInvitesHandler.coffee
View file

@ -28,6 +28,8 @@ module.exports = TeamInvitesHandler =
return callback(null, invite, subscription)
createInvite: (teamManagerId, email, callback) ->
email = EmailHelper.parseEmail(email)
return callback(new Error('invalid email')) if !email?
logger.log {teamManagerId, email}, "Creating manager team invite"
UserGetter.getUser teamManagerId, (error, teamManager) ->
return callback(error) if error?
@ -45,12 +47,14 @@ module.exports = TeamInvitesHandler =
createInvite(subscription, email, inviterName, callback)
createDomainInvite: (user, licence, callback) ->
logger.log {licence, email: user.email}, "Creating domain team invite"
email = EmailHelper.parseEmail(user.email)
return callback(new Error('invalid email')) if !email?
logger.log {licence, email: email}, "Creating domain team invite"
inviterName = licence.name.replace(/\s+licence$/i, licence.name)
SubscriptionLocator.getSubscription licence.subscription_id, (error, subscription) ->
return callback(error) if error?
createInvite(subscription, user.email, inviterName, callback)
createInvite(subscription, email, inviterName, callback)
acceptInvite: (token, userId, callback) ->
logger.log {userId}, "Accepting invite"
@ -64,6 +68,8 @@ module.exports = TeamInvitesHandler =
removeInviteFromTeam(subscription.id, invite.email, callback)
revokeInvite: (teamManagerId, email, callback) ->
email = EmailHelper.parseEmail(email)
return callback(new Error('invalid email')) if !email?
logger.log {teamManagerId, email}, "Revoking invite"
SubscriptionLocator.getUsersSubscription teamManagerId, (err, teamSubscription) ->
return callback(err) if err?
@ -87,7 +93,6 @@ createInvite = (subscription, email, inviterName, callback) ->
return callback(error) if error?
return callback(reason) unless possible
email = EmailHelper.parseEmail(email)
invite = subscription.teamInvites.find (invite) -> invite.email == email
@ -114,7 +119,6 @@ createInvite = (subscription, email, inviterName, callback) ->
return callback(error, invite)
removeInviteFromTeam = (subscriptionId, email, callback) ->
email = EmailHelper.parseEmail(email)
searchConditions = { _id: new ObjectId(subscriptionId.toString()) }
removeInvite = { $pull: { teamInvites: { email: email } } }
logger.log {subscriptionId, email, searchConditions, removeInvite}, 'removeInviteFromTeam'
@ -129,7 +133,7 @@ removeLegacyInvite = (subscriptionId, email, callback) ->
_id: new ObjectId(subscriptionId.toString())
}, {
$pull: {
invited_emails: EmailHelper.parseEmail(email)
invited_emails: email
}
}, callback)