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

Merge pull request #3755 from overleaf/jpa-xss-2

Browse source 
[views] mitigate Angular XSS via email/new_email

GitOrigin-RevId: 3d127c283ba9f97c5b0e6c53a9d77f7f597058bb
This commit is contained in:
Jakob Ackermann 2021-03-17 14:29:43 +01:00 committed by Copybot
parent 7609b741fa
commit f353728bda
5 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
services/web/app/src/Features/User/UserPagesController.js
View file

@ -22,7 +22,6 @@ const UserPagesController = {
title: 'register', title: 'register',
sharedProjectData, sharedProjectData,
newTemplateData, newTemplateData,
new_email: req.query.new_email || '',
samlBeta: req.session.samlBeta samlBeta: req.session.samlBeta
}) })
}, },
@ -37,8 +36,7 @@ const UserPagesController = {
AuthenticationController.setRedirectInSession(req, req.query.redir) AuthenticationController.setRedirectInSession(req, req.query.redir)
} }
res.render('user/login', { res.render('user/login', {
title: 'login', title: 'login'
email: req.query.email
}) })
}, },

1
services/web/app/views/user/login.pug
View file

@ -22,7 +22,6 @@ block content
placeholder='email@example.com', placeholder='email@example.com',
ng-model="email", ng-model="email",
ng-model-options="{ updateOn: 'blur' }", ng-model-options="{ updateOn: 'blur' }",
ng-init="email = "+JSON.stringify(email),
focus="true" focus="true"
) )
span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty")

1
services/web/app/views/user/settings.pug
View file

@ -32,7 +32,6 @@ block content
placeholder="email@example.com" placeholder="email@example.com"
required, required,
ng-model="email", ng-model="email",
ng-init="email = "+JSON.stringify(user.email),
ng-model-options="{ updateOn: 'blur' }" ng-model-options="{ updateOn: 'blur' }"
) )
span.small.text-danger(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty") span.small.text-danger(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty")

8
services/web/frontend/js/directives/asyncForm.js
View file

@ -3,17 +3,21 @@ import 'libs/passfield'
App.directive('asyncForm', ($http, validateCaptcha, validateCaptchaV3) => ({ App.directive('asyncForm', ($http, validateCaptcha, validateCaptchaV3) => ({
controller: [ controller: [
'$scope', '$scope',
function($scope) { '$location',
function($scope, $location) {
this.getEmail = () => $scope.email this.getEmail = () => $scope.email
this.getEmailFromQuery = () =>
$location.search().email || $location.search().new_email
return this return this
} }
], ],
link(scope, element, attrs) { link(scope, element, attrs, ctrl) {
let response let response
const formName = attrs.asyncForm const formName = attrs.asyncForm
scope[attrs.name].response = response = {} scope[attrs.name].response = response = {}
scope[attrs.name].inflight = false scope[attrs.name].inflight = false
scope.email = scope.email || ctrl.getEmailFromQuery() || attrs.newEmail
const validateCaptchaIfEnabled = function(callback) { const validateCaptchaIfEnabled = function(callback) {
if (attrs.captchaActionName) { if (attrs.captchaActionName) {

1
services/web/modules/user-activate/app/views/user/activate.pug
View file

@ -35,7 +35,6 @@ block content
placeholder="email@example.com" placeholder="email@example.com"
required, required,
ng-model="email", ng-model="email",
ng-init="email = "+JSON.stringify(email),
ng-model-options="{ updateOn: 'blur' }", ng-model-options="{ updateOn: 'blur' }",
disabled disabled
) )