Master to 0.4.0 #616

lirantal · 2015-07-03T07:58:25Z

This is 0.4.0 branch after I merged it with changes from master and fixes.
Once we review it and want to continue forward with move to 0.4.0:

We will merge this PR with 0.4.0
We will merge any outstanding and important 0.4.0 PRs with 0.4.0
We will merge 0.4.0 into master and make it an 0.4.0 release

It used to fail silently (client only displays error when a message is available).

removed extra comma

… specific host

The user password salt should be encoded with Base64 before being saved to the database. The current code adds an unecessary step of converting the result of crypto.randomBytes() (which already returns a SlowBuffer) to a Base64 string and back again to a Buffer, and misses the final step of converting the Buffer's bytes back to a Base64 string. Because of this, the salt stored in the database is garbled. This is inconvenient when manipulating the data in a terminal or text editor. When generating the password hash, the crypto.pbkdf2Sync() method creates a new Buffer directly from the data supplied. Due to the incorrect encoding of the salt, entropy is lost at this step, weakening the security of stored passwords against brute force attacks.

Currently createTransport is unnecessarily called upon every time a password request is made.

…ub.com/lirantal/meanjs into lirantal-enhancements-express-cookie-parameters Conflicts: config/env/all.js

…ookie-parameters Enhancements express cookie parameters

Fixed two tiny typos.

… application startup

details on breaking changes: https://github.com/angular-ui/bootstrap/blob/eec68d81f4f72363d37493c495b 892347bdb9e1b/CHANGELOG.md Conflicts: bower.json

…h is replaced by new output

fix getToggleElement on dropdown by updating to angular-bootstrap 0.12.0 #250

typo

Removed unneeded comas from gruntfile.

Abstract nodemailer createTransport

Show error message when sending password request mail fails

Remove unecessary comment in karma.conf.js

ilanbiala · 2015-07-03T17:09:48Z

package.json

@@ -95,4 +95,4 @@
 		"karma-firefox-launcher": "~0.1.3",
 		"karma-phantomjs-launcher": "~0.1.2"
 	}
-}
+}


Newline needed

ilanbiala · 2015-07-03T17:10:36Z

@lirantal @roieki @amoshaviv @NeverOddOrEven @Shrizzy Left some comments to review.

…d from the merge of 0.4.0 into master

lirantal · 2015-07-04T22:13:29Z

thanks @ilanbiala I addressed all issues you mentioned

- remove access.log (*.log is enough) - Move local.js config under MEAN.JS - Rename iOS/Apple => OS (this is a mix of windows/osx stuff anyways)

…configuration

Sort out gitignore

lirantal · 2015-07-06T20:32:23Z

@ilanbiala I think we're good to merge this to 0.4, right?

ilanbiala · 2015-07-06T20:48:09Z

Yes, I think so.

mleanos · 2015-07-06T23:53:24Z

Had a holiday weekend, so I didn't spend much time at my computer over the last few days.

So far it looks good to me. I'm still going through it right now.

rhutchison · 2015-07-07T00:49:26Z

Update dependencies: #622

mleanos · 2015-07-07T03:57:38Z

All seems fine with me as well. I think we can start merging this into 0.4

This reverts commit 7d8cea1.

mleanos · 2015-07-08T05:24:01Z

I forked this repository. I then checked the master_to_0.4.0 branch out, and tested locally. Everything went fine, and I merged it to the 0.4.0. The merge had no issues at all, and everything seems to be working perfectly.

I'm not sure what I should do next to help this merge, and then to begin helping out with merging all the PR's.

Forgive me, but I'm a bit new to the forking and contributing aspect of GitHub. Should I push my new 0.4.0 branch to my repo, and create a pull request? I did make one modification to the gitingore. I added VS files.

lirantal · 2015-07-08T05:58:50Z

@mleanos thanks for helping out.
The procedure you did confirms that we shouldn't have any issues with the merge, but basically the plan is now:

Merge this PR master_to_0.4.0 to 0.4.0
Then merge any valid and outstanding 0.4.0 PRs to 0.4.0
Then we make a 0.4.0 release and merge 0.4.0 to master

At the moment I'm just waiting to figure out if we're merging this PR #622 to master_to_0.4.0 before I'm closing it, and then we can continue.

@mleanos once step (2) is finished we'll need quite some help with testing the 0.4.0 branch and that's where you can help the most. It'll be a few days/week until we're there.

Thanks for chiming in!

update dependencies

Master to 0.4.0

jloveland · 2015-07-12T01:18:27Z

scripts/generate-ssl-certs.sh

 openssl genrsa -out ./config/sslcerts/key.pem -aes256 1024
 openssl req -new -key ./config/sslcerts/key.pem -out ./config/sslcerts/csr.pem
 openssl x509 -req -days 9999 -in ./config/sslcerts/csr.pem -signkey ./config/sslcerts/key.pem -out ./config/sslcerts/cert.pem
 rm ./config/sslcerts/csr.pem
-# resolve issue with bad password...
-# Error: error:0906A068:PEM routines:PEM_do_header:bad password read


@lirantal for some reason I get this error running with ssl after generating a cert with a password:
Error: error:0906A068:PEM routines:PEM_do_header:bad password read

my suspicion is that node is not asking me for the password when running grunt prod. I am running with node v0.12.5

to resolve, I needed to remove the password from the pem like so:

openssl rsa -in ./config/sslcerts/key.pem -out ./config/sslcerts/newkey.pem && mv ./config/sslcerts/newkey.pem ./config/sslcerts/key.pem chmod 0600 ./config/sslcerts/key.pem ./config/sslcerts/cert.pem

not sure if anyone else has seen this, but I mentioned the a reference to another person solving this issue the same way:
http://blog.mgechev.com/2014/02/19/create-https-tls-ssl-application-with-express-nodejs/

should I open a ticket for this?

@jloveland yes, please open an issue on that and assign it to me, I'll get to it later this week.

lirantal and others added 30 commits October 14, 2014 12:14

adding support for configurable session cookie parameters for express

5d20988

fixing identations

84efda1

Show error message when sending password request mail fails

619c7f2

It used to fail silently (client only displays error when a message is available).

typo

86d38df

removed extra comma

added domain configuration option if required to set the cookie for a…

7174625

… specific host

Remove unecessary comment in karma.conf.js

d27baea

Update package.json

30fd05c

Abstract nodemailer createTransport

d5cf18a

Currently createTransport is unnecessarily called upon every time a password request is made.

Merge branch 'enhancements-express-cookie-parameters' of https://gith…

3217aa0

…ub.com/lirantal/meanjs into lirantal-enhancements-express-cookie-parameters Conflicts: config/env/all.js

Merge branch 'lirantal-enhancements-express-cookie-parameters'

1852c64

Update .travis.yml

fd98f26

Merge pull request #260 from lirantal/lirantal-enhancements-express-c…

e46100d

…ookie-parameters Enhancements express cookie parameters

Fixed two tiny typos.

959d7e7

Merge remote-tracking branch 'upstream/master'

b92f232

Fixed error message for non-unique username.

873e91f

Merge pull request #264 from wesleyfsmith/master

b4e55f9

Fixed two tiny typos.

Removed unneeded comas from gruntfile.

e4519bc

providing more verbose output for current nodejs app configuration on…

374b45c

… application startup

update to angular-bootstrap 0.12.0 + fix breaking changes

adf6e0c

details on breaking changes: https://github.com/angular-ui/bootstrap/blob/eec68d81f4f72363d37493c495b 892347bdb9e1b/CHANGELOG.md Conflicts: bower.json

removing debug information for current environment configuration whic…

e2b91b0

…h is replaced by new output

Merge pull request #269 from jeromegv/upstream

e2c3155

fix getToggleElement on dropdown by updating to angular-bootstrap 0.12.0 #250

Merge pull request #245 from ejsuncy/patch-1

7cbd6e0

typo

Merge pull request #266 from wesleyfsmith/master

5764270

Removed unneeded comas from gruntfile.

Merge pull request #259 from mindmelting/bug/fix_nodemailer_instance

6783ba5

Abstract nodemailer createTransport

Merge pull request #225 from uwolfer/password-request-mail-failure

b7a47d1

Show error message when sending password request mail fails

Merge pull request #248 from amckinlay/patch-1

e64fae8

Remove unecessary comment in karma.conf.js

Update home.client.view.html

bf5268e

updating debug information to support https mode reporting

2786c95

Merge remote-tracking branch 'upstream/master'

5c975c1

ilanbiala reviewed Jul 3, 2015
View reviewed changes

package.json

@@ -95,4 +95,4 @@

"karma-firefox-launcher": "~0.1.3",

"karma-phantomjs-launcher": "~0.1.2"

}

}

}

Copy link

Member

ilanbiala Jul 3, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newline needed

lirantal added 2 commits July 4, 2015 01:42

support for test:server and test:client grunt tasks which were remove…

2be8f71

…d from the merge of 0.4.0 into master

addressing missing newlines and node 0.12 version for travis-ci

d5b22e3

simison and others added 8 commits July 5, 2015 23:09

Sorting out .gitignore

75aad2e

- remove access.log (*.log is enough) - Move local.js config under MEAN.JS - Rename iOS/Apple => OS (this is a mix of windows/osx stuff anyways)

update dependencies

d4c880b

load bootstrap (doh)

7d8cea1

setup dropdown menu

30c9160

update javascript libs

00a4668

package.json will always use 2 spaces indent

73be794

keeping nodejs versions 0.10 and 0.12 as the test servers for travis …

96f8ab5

…configuration

Merge pull request #621 from simison/patch-10

2159094

Sort out gitignore

rhutchison added 4 commits July 7, 2015 08:18

Revert "load bootstrap (doh)"

73b5fa3

This reverts commit 7d8cea1.

remove href attribute.

9ca71c8

fix failing tests

67e38ae

fix btn-large class names.

b6818b6

Merge pull request #622 from Gym/0.4.0

99e0ea8

update dependencies

lirantal added a commit that referenced this pull request Jul 8, 2015

Merge pull request #616 from meanjs/master_to_0.4.0

c2bcfa3

Master to 0.4.0

lirantal merged commit c2bcfa3 into 0.4.0 Jul 8, 2015

jloveland reviewed Jul 12, 2015
View reviewed changes

ilanbiala deleted the master_to_0.4.0 branch August 13, 2015 13:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Master to 0.4.0 #616

Master to 0.4.0 #616

lirantal commented Jul 3, 2015

ilanbiala Jul 3, 2015

ilanbiala commented Jul 3, 2015

lirantal commented Jul 4, 2015

lirantal commented Jul 6, 2015

ilanbiala commented Jul 6, 2015

mleanos commented Jul 6, 2015

rhutchison commented Jul 7, 2015

mleanos commented Jul 7, 2015

mleanos commented Jul 8, 2015

lirantal commented Jul 8, 2015

jloveland Jul 12, 2015

lirantal Jul 12, 2015

Master to 0.4.0 #616

Master to 0.4.0 #616

Conversation

lirantal commented Jul 3, 2015

ilanbiala Jul 3, 2015

Choose a reason for hiding this comment

ilanbiala commented Jul 3, 2015

lirantal commented Jul 4, 2015

lirantal commented Jul 6, 2015

ilanbiala commented Jul 6, 2015

mleanos commented Jul 6, 2015

rhutchison commented Jul 7, 2015

mleanos commented Jul 7, 2015

mleanos commented Jul 8, 2015

lirantal commented Jul 8, 2015

jloveland Jul 12, 2015

Choose a reason for hiding this comment

lirantal Jul 12, 2015

Choose a reason for hiding this comment