This repository was archived by the owner on Jan 24, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 10
Bug 916896 - Check for valid usernames #24
Open
cadecairos
wants to merge
1
commit into
mozilla:master
Choose a base branch
from
cadecairos:bug916896
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,8 @@ var request = require( "request" ), | |
| Fogin = require( "./test/Fogin.js" ), | ||
| persona = require( "express-persona" ); | ||
|
|
||
| var USERNAME_REGEX = /^[abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\-\_]{1,20}$/; | ||
|
|
||
| /** | ||
| * Module.exports | ||
| **/ | ||
|
|
@@ -54,6 +56,10 @@ module.exports = function ( app, options ) { | |
|
|
||
| var loginAPI = { | ||
| getUser: function ( id, callback ) { | ||
| if ( !USERNAME_REGEX.test( id ) ) { | ||
| // invalid username | ||
| return callback( "Invalid Username" ); | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. For both these checks (here and the new one below in isAdmin), we're going to have to make sure that downstream consumers are doing the proper error handling (they should be, but keep this in mind, since we just introduced a new error case they all need to care about). Probably reflecting this change in as a more major version bump is a good idea. |
||
| } | ||
| request({ | ||
| auth: { | ||
| username: authBits.user, | ||
|
|
@@ -88,6 +94,10 @@ module.exports = function ( app, options ) { | |
| }); | ||
| }, | ||
| isAdmin: function ( id, callback ) { | ||
| if ( !USERNAME_REGEX.test( id ) ) { | ||
| // invalid username | ||
| return callback( "Invalid Username" ); | ||
| } | ||
| request({ | ||
| auth: { | ||
| username: authBits.user, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It sucks that we have multiple places where this needs to be maintained. I know how to fix that, but it will add a ton of overhead too. Sucks either way.