Skip to content
This repository has been archived by the owner on Apr 3, 2019. It is now read-only.

Commit

Permalink
feat(signin): Add regex for enabling signin confirmation (#1290) r=pb…
Browse files Browse the repository at this point in the history 
…ooth

* feat(signin): Add ability to enable signin confirmation on an email regex

* feat(signin): Add missing email domain regex test

* feat(signin): Updated docs
  • Loading branch information
@vbudhram
vbudhram authored Jun 16, 2016
1 parent abfa791 commit fa02ee8
Show file tree
Hide file tree
Showing 3 changed files with 144 additions and 15 deletions.
8 changes: 4 additions & 4 deletions config/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,13 +419,13 @@ var conf = convict({
],
env: 'SIGNIN_CONFIRMATION_SUPPORTED_CLIENTS'
},
forceEmails: {
doc: 'If feature enabled, force sign-in confirmation for these email domains',
forceEmailRegex: {
doc: 'If feature enabled, force sign-in confirmation for email addresses matching this regex.',
format: Array,
default: [
'@mozilla.com'
'@mozilla.com$'
],
env: 'SIGNIN_CONFIRMATION_FORCE_EMAILS'
env: 'SIGNIN_CONFIRMATION_FORCE_EMAIL_REGEX'
}
}
})
Expand Down
9 changes: 6 additions & 3 deletions lib/routes/utils/request_helper.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,13 @@ function shouldEnableSigninConfirmation(account, config, request) {
return false
}

// If feature enabled, always enable for these emails
// If feature enabled, always enable for email addresses matching this regex
var email = account.email
var emailDomain = account.email.substring(email.indexOf('@'), email.length).toLocaleLowerCase()
var isValidEmail = config.signinConfirmation.forceEmails.indexOf(emailDomain) > -1
var isValidEmail = config.signinConfirmation.forceEmailRegex.some(function (reg) {
var emailReg = new RegExp(reg)
return emailReg.test(email)
})

if (isValidEmail) {
return true
}
Expand Down
142 changes: 134 additions & 8 deletions test/local/account_routes.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var isA = require('joi')
var error = require('../../lib/error')
var log = require('../../lib/log')

var TEST_EMAIL = 'foo@gmail.com'
var TEST_EMAIL = 'foo@bloop.com'
var TEST_EMAIL_INVALID = 'example@dotless-domain'

var makeRoutes = function (options) {
Expand Down Expand Up @@ -773,7 +773,7 @@ test(
signinConfirmation: {
enabled: false,
supportedClients: ['fx_desktop_v3'],
forceEmails:['@mozilla.com']
forceEmailRegex:['mozilla.com$']
},
newLoginNotificationEnabled: true
}
Expand Down Expand Up @@ -815,7 +815,7 @@ test(
enabled: true,
sample_rate: 1.0,
supportedClients: ['fx_desktop_v3'],
forceEmails:['@mozilla.com']
forceEmailRegex:['mozilla.com$']
}
}

Expand Down Expand Up @@ -856,7 +856,7 @@ test(
enabled: true,
sample_rate: 0.20,
supportedClients: ['fx_desktop_v3'],
forceEmails:['@mozilla.com']
forceEmailRegex:['mozilla.com$']
}
}

Expand Down Expand Up @@ -890,14 +890,14 @@ test(
)

test(
'login with sign-in confirmation enabled for specific email',
'login with sign-in confirmation enable for email regex',
function (t) {
var configOptions = {
signinConfirmation: {
enabled: true,
sample_rate: 0.00,
supportedClients: ['fx_desktop_v3'],
forceEmails:['@mozilla.com']
forceEmailRegex: ['@mozilla.com$', 'fennec@fire.fox']
}
}

Expand Down Expand Up @@ -930,6 +930,132 @@ test(
}
)

test(
'login with sign-in confirmation enable for email domain',
function (t) {
var configOptions = {
signinConfirmation: {
enabled: true,
sample_rate: 0.00,
supportedClients: ['fx_desktop_v3'],
forceEmailRegex: ['@mozilla.com$', 'fennec@fire.fox']
},
newLoginNotificationEnabled: true
}

var uid = '20162205efab47ecb6418c797acd743f'
var mockRequest = mocks.mockRequest('asdf@mozilla.com', 'true')
var mockDB = mocks.mockDB(uid, 'asdf@mozilla.com', true)
var mockMailer = mocks.mockMailer()

var accountRoutes = makeRoutes({
config: configOptions,
db: mockDB,
mailer: mockMailer,
checkPassword: function () {
return P.resolve(true)
}
})

return new P(function (resolve) {
getRoute(accountRoutes, '/account/login')
.handler(mockRequest, function (response) {
resolve(response)
})
})
.then(function (response) {
t.equal(mockMailer.sendNewDeviceLoginNotification.callCount, 0, 'mailer.sendNewDeviceLoginNotification was not called')
t.equal(mockMailer.sendVerifyLoginEmail.callCount, 1, 'mailer.sendVerifyLoginEmail was called')
t.equal(response.verificationMethod, 'email', 'verificationMethod is email')
t.equal(response.verificationReason, 'login', 'verificationReason is login')
})
}
)

test(
'login with sign-in confirmation enable for specific email',
function (t) {
var configOptions = {
signinConfirmation: {
enabled: true,
sample_rate: 0.00,
supportedClients: ['fx_desktop_v3'],
forceEmailRegex: ['@mozilla.com$', 'fennec@fire.fox']
},
newLoginNotificationEnabled: true
}

var uid = '20162205efab47ecb6418c797acd743f'
var mockRequest = mocks.mockRequest('fennec@fire.fox', 'true')
var mockDB = mocks.mockDB(uid, 'fennec@fire.fox', true)
var mockMailer = mocks.mockMailer()

var accountRoutes = makeRoutes({
config: configOptions,
db: mockDB,
mailer: mockMailer,
checkPassword: function () {
return P.resolve(true)
}
})

return new P(function (resolve) {
getRoute(accountRoutes, '/account/login')
.handler(mockRequest, function (response) {
resolve(response)
})
})
.then(function (response) {
t.equal(mockMailer.sendNewDeviceLoginNotification.callCount, 0, 'mailer.sendNewDeviceLoginNotification was not called')
t.equal(mockMailer.sendVerifyLoginEmail.callCount, 1, 'mailer.sendVerifyLoginEmail was called')
t.equal(response.verificationMethod, 'email', 'verificationMethod is email')
t.equal(response.verificationReason, 'login', 'verificationReason is login')
})
}
)

test(
'login with sign-in confirmation disabled for regex',
function (t) {
var configOptions = {
signinConfirmation: {
enabled: true,
sample_rate: 0.00,
supportedClients: ['fx_desktop_v3'],
forceEmailRegex: ['@mozilla.com$', 'fennec@fire.fox']
},
newLoginNotificationEnabled: true
}

var uid = '20162205efab47ecb6418c797acd743f'
var mockRequest = mocks.mockRequest('moz@fire.fox', 'true')
var mockDB = mocks.mockDB(uid, 'moz@fire.fox', true)
var mockMailer = mocks.mockMailer()

var accountRoutes = makeRoutes({
config: configOptions,
db: mockDB,
mailer: mockMailer,
checkPassword: function () {
return P.resolve(true)
}
})

return new P(function (resolve) {
getRoute(accountRoutes, '/account/login')
.handler(mockRequest, function (response) {
resolve(response)
})
})
.then(function (response) {
t.equal(mockMailer.sendNewDeviceLoginNotification.callCount, 1, 'mailer.sendNewDeviceLoginNotification was called')
t.equal(mockMailer.sendVerifyLoginEmail.callCount, 0, 'mailer.sendVerifyLoginEmail was not called')
t.notOk(response.verificationMethod, 'verificationMethod doesn\'t exist')
t.notOk(response.verificationReason, 'verificationReason doesn\'t exist')
})
}
)

test(
'login with sign-in confirmation, invalid client, does not perform confirmation',
function (t) {
Expand All @@ -938,7 +1064,7 @@ test(
enabled: true,
sample_rate: 1.00,
supportedClients: ['fx_desktop_v999'],
forceEmails:['@mozilla.com']
forceEmailRegex:['mozilla.com$']
},
newLoginNotificationEnabled: true
}
Expand Down Expand Up @@ -980,7 +1106,7 @@ test(
enabled: true,
sample_rate: 0.10,
supportedClients: ['fx_desktop_v3'],
forceEmails:['@mozilla.com']
forceEmailRegex:['mozilla.com$']
},
newLoginNotificationEnabled: true
}
Expand Down

0 comments on commit fa02ee8

Please sign in to comment.