Skip to content

Commit

Permalink
Bug fix - public path was getting registered before middleware allowi…
Browse files Browse the repository at this point in the history 
…ng unauthenticated access to static resources
  • Loading branch information
@arobson
arobson committed Jan 10, 2015
1 parent 70fb331 commit f666215
Show file tree
Hide file tree
Showing 20 changed files with 756 additions and 393 deletions.
295 changes: 295 additions & 0 deletions .esformatter
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,295 @@
{
"preset": "jquery",

"indent": {
"value": "\t",
"ArrayExpression": 1,
"AssignmentExpression": 1,
"BinaryExpression": 1,
"ConditionalExpression": 1,
"CallExpression": 1,
"CatchClause": 1,
"DoWhileStatement": 1,
"ForInStatement": 1,
"ForStatement": 1,
"FunctionDeclaration": 1,
"FunctionExpression": 1,
"IfStatement": 1,
"MemberExpression": 1,
"MultipleVariableDeclaration": 1,
"ObjectExpression": 1,
"ReturnStatement": 1,
"SwitchCase": 1,
"SwitchStatement": 1,
"TopLevelFunctionBlock": 1,
"TryStatement": 1,
"WhileStatement": 1
},
"lineBreak": {
"value": "\n",
"before": {
"AssignmentExpression": ">=1",
"AssignmentOperator": 0,
"BlockStatement": 0,
"CallExpression": -1,
"ConditionalExpression": ">=1",
"CatchOpeningBrace": 0,
"CatchClosingBrace": ">=1",
"CatchKeyword": 0,
"DeleteOperator": ">=1",
"DoWhileStatement": ">=1",
"DoWhileStatementOpeningBrace": 0,
"DoWhileStatementClosingBrace": ">=1",
"EndOfFile": -1,
"EmptyStatement": -1,
"FinallyOpeningBrace": 0,
"FinallyClosingBrace": ">=1",
"ForInStatement": ">=1",
"ForInStatementExpressionOpening": 0,
"ForInStatementExpressionClosing": 0,
"ForInStatementOpeningBrace": 0,
"ForInStatementClosingBrace": ">=1",
"ForStatement": ">=1",
"ForStatementExpressionOpening": 0,
"ForStatementExpressionClosing": "<2",
"ForStatementOpeningBrace": 0,
"ForStatementClosingBrace": ">=1",
"FunctionExpression": 0,
"FunctionExpressionOpeningBrace": 0,
"FunctionExpressionClosingBrace": ">=1",
"FunctionDeclaration": ">=1",
"FunctionDeclarationOpeningBrace": 0,
"FunctionDeclarationClosingBrace": ">=1",
"IfStatement": ">=1",
"IfStatementOpeningBrace": 0,
"IfStatementClosingBrace": ">=1",
"ElseIfStatement": 0,
"ElseIfStatementOpeningBrace": 0,
"ElseIfStatementClosingBrace": ">=1",
"ElseStatement": 0,
"ElseStatementOpeningBrace": 0,
"ElseStatementClosingBrace": ">=1",
"LogicalExpression": -1,
"ObjectExpressionClosingBrace": -1,
"Property": -1,
"ReturnStatement": -1,
"SwitchOpeningBrace": 0,
"SwitchClosingBrace": ">=1",
"ThisExpression": -1,
"ThrowStatement": ">=1",
"TryOpeningBrace": 0,
"TryClosingBrace": ">=1",
"VariableName": ">=1",
"VariableValue": 0,
"VariableDeclaration": ">=1",
"VariableDeclarationWithoutInit": ">=1",
"WhileStatement": ">=1",
"WhileStatementOpeningBrace": 0,
"WhileStatementClosingBrace": ">=1"
},
"after": {
"AssignmentExpression": ">=1",
"AssignmentOperator": 0,
"BlockStatement": 0,
"CallExpression": -1,
"CatchOpeningBrace": ">=1",
"CatchClosingBrace": ">=0",
"CatchKeyword": 0,
"ConditionalExpression": ">=1",
"DeleteOperator": ">=1",
"DoWhileStatement": ">=1",
"DoWhileStatementOpeningBrace": ">=1",
"DoWhileStatementClosingBrace": 0,
"EmptyStatement": -1,
"FinallyOpeningBrace": ">=1",
"FinallyClosingBrace": ">=1",
"ForInStatement": ">=1",
"ForInStatementExpressionOpening": "<2",
"ForInStatementExpressionClosing": -1,
"ForInStatementOpeningBrace": ">=1",
"ForInStatementClosingBrace": ">=1",
"ForStatement": ">=1",
"ForStatementExpressionOpening": "<2",
"ForStatementExpressionClosing": -1,
"ForStatementOpeningBrace": ">=1",
"ForStatementClosingBrace": ">=1",
"FunctionExpression": ">=1",
"FunctionExpressionOpeningBrace": ">=1",
"FunctionExpressionClosingBrace": -1,
"FunctionDeclaration": ">=1",
"FunctionDeclarationOpeningBrace": ">=1",
"FunctionDeclarationClosingBrace": ">=1",
"IfStatement": ">=1",
"IfStatementOpeningBrace": ">=1",
"IfStatementClosingBrace": ">=1",
"ElseIfStatement": ">=1",
"ElseIfStatementOpeningBrace": ">=1",
"ElseIfStatementClosingBrace": ">=1",
"ElseStatement": ">=1",
"ElseStatementOpeningBrace": ">=1",
"ElseStatementClosingBrace": ">=1",
"LogicalExpression": -1,
"ObjectExpressionOpeningBrace": -1,
"Property": 0,
"ReturnStatement": -1,
"SwitchOpeningBrace": ">=1",
"SwitchClosingBrace": ">=1",
"ThisExpression": 0,
"ThrowStatement": ">=1",
"TryOpeningBrace": ">=1",
"TryClosingBrace": 0,
"VariableDeclaration": ">=1",
"WhileStatement": ">=1",
"WhileStatementOpeningBrace": ">=1",
"WhileStatementClosingBrace": ">=1"
}
},
"whiteSpace": {
"value": " ",
"removeTrailing": 1,
"before": {
"ArrayExpressionOpening": 0,
"ArrayExpressionClosing": 1,
"ArrayExpressionComma": 0,
"ArgumentComma": 0,
"ArgumentList": 1,
"ArgumentListArrayExpression": 1,
"ArgumentListFunctionExpression": 1,
"ArgumentListObjectExpression": 1,
"AssignmentOperator": 1,
"BinaryExpression": 0,
"BinaryExpressionOperator": 1,
"BlockComment": 1,
"CallExpression": -1,
"CatchParameterList": 0,
"CatchOpeningBrace": 1,
"CatchClosingBrace": 1,
"CatchKeyword": 1,
"CommaOperator": 0,
"ConditionalExpressionConsequent": 1,
"ConditionalExpressionAlternate": 1,
"DoWhileStatementOpeningBrace": 1,
"DoWhileStatementClosingBrace": 1,
"DoWhileStatementConditional": 1,
"EmptyStatement": 0,
"ExpressionClosingParentheses": 1,
"FinallyOpeningBrace": 1,
"FinallyClosingBrace": 1,
"ForInStatement": 1,
"ForInStatementExpressionOpening": 1,
"ForInStatementExpressionClosing": 0,
"ForInStatementOpeningBrace": 1,
"ForInStatementClosingBrace": 1,
"ForStatement": 1,
"ForStatementExpressionOpening": 1,
"ForStatementExpressionClosing": 0,
"ForStatementOpeningBrace": 1,
"ForStatementClosingBrace": 1,
"ForStatementSemicolon": 0,
"FunctionDeclarationOpeningBrace": 1,
"FunctionDeclarationClosingBrace": 1,
"FunctionExpressionOpeningBrace": 1,
"FunctionExpressionClosingBrace": 1,
"IfStatementConditionalOpening": 1,
"IfStatementConditionalClosing": 1,
"IfStatementOpeningBrace": 1,
"IfStatementClosingBrace": 1,
"ElseStatementOpeningBrace": 1,
"ElseStatementClosingBrace": 1,
"ElseIfStatementOpeningBrace": 1,
"ElseIfStatementClosingBrace": 1,
"MemberExpressionClosing": 1,
"LineComment": 1,
"LogicalExpressionOperator": 1,
"ObjectExpressionClosingBrace": 1,
"Property": 1,
"PropertyValue": 1,
"ParameterComma": 0,
"ParameterList": 1,
"SwitchDiscriminantOpening": 1,
"SwitchDiscriminantClosing": 0,
"ThrowKeyword": 1,
"TryOpeningBrace": 1,
"TryClosingBrace": 1,
"UnaryExpressionOperator": 0,
"VariableName": 1,
"VariableValue": 1,
"WhileStatementConditionalOpening": 1,
"WhileStatementConditionalClosing": 0,
"WhileStatementOpeningBrace": 1,
"WhileStatementClosingBrace": 1
},
"after": {
"ArrayExpressionOpening": 1,
"ArrayExpressionClosing": 0,
"ArrayExpressionComma": 1,
"ArgumentComma": 1,
"ArgumentList": 1,
"ArgumentListArrayExpression": 1,
"ArgumentListFunctionExpression": 1,
"ArgumentListObjectExpression": 1,
"AssignmentOperator": 1,
"BinaryExpression": 0,
"BinaryExpressionOperator": 1,
"BlockComment": 1,
"CallExpression": 0,
"CatchParameterList": 0,
"CatchOpeningBrace": 1,
"CatchClosingBrace": 1,
"CatchKeyword": 1,
"CommaOperator": 1,
"ConditionalExpressionConsequent": 1,
"ConditionalExpressionTest": 1,
"DoWhileStatementOpeningBrace": 1,
"DoWhileStatementClosingBrace": 1,
"DoWhileStatementBody": 1,
"EmptyStatement": 0,
"ExpressionOpeningParentheses": 1,
"FinallyOpeningBrace": 1,
"FinallyClosingBrace": 1,
"ForInStatement": 1,
"ForInStatementExpressionOpening": 0,
"ForInStatementExpressionClosing": 1,
"ForInStatementOpeningBrace": 1,
"ForInStatementClosingBrace": 1,
"ForStatement": 1,
"ForStatementExpressionOpening": 0,
"ForStatementExpressionClosing": 1,
"ForStatementClosingBrace": 1,
"ForStatementOpeningBrace": 1,
"ForStatementSemicolon": 1,
"FunctionReservedWord": 0,
"FunctionName": 0,
"FunctionExpressionOpeningBrace": 1,
"FunctionExpressionClosingBrace": 0,
"FunctionDeclarationOpeningBrace": 1,
"FunctionDeclarationClosingBrace": 1,
"IfStatementConditionalOpening": 1,
"IfStatementConditionalClosing": 1,
"IfStatementOpeningBrace": 1,
"IfStatementClosingBrace": 1,
"ElseStatementOpeningBrace": 1,
"ElseStatementClosingBrace": 1,
"ElseIfStatementOpeningBrace": 1,
"ElseIfStatementClosingBrace": 1,
"MemberExpressionOpening": 1,
"LogicalExpressionOperator": 1,
"ObjectExpressionClosingBrace": 0,
"PropertyName": 0,
"PropertyValue": 0,
"ParameterComma": 1,
"ParameterList": 1,
"SwitchDiscriminantOpening": 0,
"SwitchDiscriminantClosing": 1,
"ThrowKeyword": 1,
"TryOpeningBrace": 1,
"TryClosingBrace": 1,
"UnaryExpressionOperator": 0,
"VariableName": 1,
"WhileStatementConditionalOpening": 0,
"WhileStatementConditionalClosing": 1,
"WhileStatementOpeningBrace": 1,
"WhileStatementClosingBrace": 1
}
}
}
6 changes: 5 additions & 1 deletion CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
## 0.3.0
Primary motivation here is to begin work on a version of autohost that will work well with a hypermedia library ( [hyped](https://github.com/leankit-labs/hyped) ). This is a breaking change because of several structural and naming changes to how resources get modeled.

### prerelease 16
* Bug fix - public path was getting registered before middleware causing static resources under public to get served regardless of authorization.
* Formatting (esformatter and then manual clean up)

### prerelease 15
Bug fix - passport should not attempt to initialize when no auth provider is passed to init.

Expand Down Expand Up @@ -74,4 +78,4 @@ Eliminate "feature" that prefixes action URLs with resource name - ultimately a


## 0.2.0
Rewritten from scratch to address several design flaws and lack of testability in the library. New design focuses on a general approach to resource handling and then passing off loaded resources to various transport adapters which then determine how to route incoming requests/messages to the correct resource/action.
Rewritten from scratch to address several design flaws and lack of testability in the library. New design focuses on a general approach to resource handling and then passing off loaded resources to various transport adapters which then determine how to route incoming requests/messages to the correct resource/action.
29 changes: 16 additions & 13 deletions demo/index.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
var host = require( '../src/index.js' );
var authProvider = require( 'autohost-nedb-auth' )( {} );

var redis = require( 'redis' ).createClient(); // assumes a locally running redis server
var RedisStore = require( 'connect-redis' )( host.session );
var store = new RedisStore( {
client: redis,
prefix: 'ah:'
} );
var hyped = require( 'hyped' )();
// var redis = require( 'redis' ).createClient(); // assumes a locally running redis server
// var RedisStore = require( 'connect-redis' )( host.session );
// var store = new RedisStore( {
// client: redis,
// prefix: 'ah:'
// } );

try {
host.init( {
Expand All @@ -19,16 +19,19 @@ try {
anonymous: [ '/$', '/js', '/css' ],
sessionId: 'myapp.sid',
sessionSecret: 'youdontevenknow',
sessionStore: store,
noOptions: true,
urlStrategy: hyped.urlStrategy
// sessionStore: store,
},
authProvider );


authProvider )
.then( hyped.addResources );
hyped.setupMiddleware( host );

// }, require( 'autohost-nedb-auth' )( {} ) );
// }, require( 'autohost-riak-auth' )(
// { appName: 'ahdemo',
// { appName: 'ahdemo',
// riak: { nodes: [
// { host: 'ubuntu' }
// ] }
// } ) );
} catch( e ) { console.log( e.stack ); }
} catch( e ) { console.log( e.stack ); }
Loading

0 comments on commit f666215

Please sign in to comment.