AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-08 22:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,542 Commits 34 Branches 105 Tags
3-2-github
Commit Graph

8420 Commits

Author SHA1 Message Date
Charlie Somerville
76ad4030e5 whoops, we don't want to create an output_buffer local 2014-10-07 16:35:37 +11:00
Charlie Somerville
d69e65ab34 use bytesize and byteslice rather than length and slice! 2014-10-07 16:29:14 +11:00
Charlie Somerville
bce8b07309 ignore nil session["flash"] 2014-09-26 15:26:13 +10:00
Greg Ose
3fe553fa31 more like 3.2 2014-09-24 13:25:13 -05:00
Greg Ose
e1c7a232ca update FlashHash for 3.2 2014-09-24 12:39:03 -05:00
Charlie Somerville
283923f530 we don't care about deserializing old marshal sessions anymore 2014-09-23 16:41:38 +10:00
Greg Ose
18d37237c4 attribute flash hash test source 2014-09-23 16:22:28 +10:00
Greg Ose
b30301bb6d clearer comment on session value format 2014-09-23 16:22:25 +10:00
Greg Ose
d12475ba60 support old marshalled cookies 2014-09-23 16:22:15 +10:00
Greg Ose
d106a28675 not until 4.0 2014-09-23 16:22:10 +10:00
Greg Ose
67b3fd5cb8 Custom cookie serializer test 
Adapted from
b23ffd0dac/actionpack/test/dispatch/cookies_test.rb (L382-L413)
 2014-09-23 16:21:49 +10:00
Greg Ose
0342deaa22 update flash hash test for 3.0 backport 2014-09-23 16:21:44 +10:00
Greg Ose
91bbe59e17 add flash hash tests 2014-09-23 16:21:37 +10:00
Greg Ose
f0895f838f 📗? Update tests and FlashHash cleanup 
* Make FlashHash more like 4.1 (654a2de7a9)
* Move tests to stringified keys (b97e087321)
* Fix tests to properly load / store to session
 2014-09-23 16:19:09 +10:00
Greg Ose
c9a54ce81d actually backport flash to 3.0 instead of 3.2 2014-09-23 16:16:54 +10:00
Greg Ose
f6844fc683 move serialization option from cookie option to global env option 2014-09-23 16:14:57 +10:00
Greg Ose
b09eac885e initial conversion to rails 4 flash hash, debugging marshalling issue 2014-09-23 16:13:23 +10:00
Greg Ose
1edd8b587b serializer option for cookie store 2014-09-23 16:07:59 +10:00
Charlie Somerville
8b5e2df964 shut this deprecation warning up for now 2014-09-19 18:26:17 +10:00
Charlie Somerville
7f3ec3496d remove sprockets dependency 2014-09-15 14:36:51 +10:00
Charlie Somerville
88827a2cab rip out a bunch of sprockets stuff 2014-09-15 14:35:28 +10:00
Charlie Somerville
94331729a1 rename SprocketsApp here to RackApp to not confuse me when grepping 2014-09-15 14:35:17 +10:00
Charlie Somerville
7684d715ef Merge remote-tracking branch 'upstream/3-2-stable' into 3-2-github 2014-09-15 14:04:33 +10:00
Santiago Pastorino
11fd052aa8 Regenerate sid when sbdy tries to fixate the session 
Fixed broken test.

Thanks Stephen Richards for reporting.
 2014-08-04 11:36:43 -03:00
Rafael Mendonça França
53c845cb18 Preparing for 3.2.19 release 2014-07-02 12:55:09 -03:00
Aaron Patterson
6a051299f9 Feature detect based on Ruby version. 
I didn't want to do this, FNM_EXTGLOB is defined on 2.1.x, but Dir.glob
returns the wrong value on Ruby less than 2.2.0.  Checking for a
case-insensitive FS seems too hard, so just check Ruby version  Checking
for a case-insensitive FS seems too hard, so just check Ruby version.
 2014-05-18 12:00:57 -07:00
Aaron Patterson
c40df47055 feature detect for FNM_EXTGLOB for older Ruby. Fixes #15053 2014-05-10 11:53:02 -07:00
Aaron Patterson
03e016f22a use fnmatch to test for case insensitive file systems 
this is due to:

  https://bugs.ruby-lang.org/issues/5994
 2014-05-09 14:46:46 -07:00
Rafael Mendonça França
bbec7d72be Merge branch '3-2-sec' into 3-2-stable 
Conflicts:
	actionpack/CHANGELOG.md
 2014-05-06 13:31:07 -03:00
Rafael Mendonça França
50d6b4549d Fix broken tests of the previous release 2014-05-06 13:03:21 -03:00
Rafael Mendonça França
4e8f1d2588 Preparing for 3.2.18 release 2014-05-06 11:33:10 -03:00
Rafael Mendonça França
0f3b7d1a31 Only accept actions without File::SEPARATOR in the name. 
This will avoid directory traversal in implicit render.

Fixes: CVE-2014-0130
 2014-05-05 11:37:34 -03:00
Charlie Somerville
a54e2e4a72 bump to builder 3.2 2014-04-10 22:53:51 +10:00
Rafael Mendonça França
a3bda38467 Merge branch '3-2-17' into 3-2-stable 
Conflicts:
	actionpack/CHANGELOG.md
 2014-02-18 15:57:32 -03:00
Rafael Mendonça França
666e9f65bd Preparing for 3.2.17 release 2014-02-18 15:16:57 -03:00
Rafael Mendonça França
388d2f8888 Use the reference for the mime type to get the format 
Before we were calling to_sym in the mime type, even when it is unknown
what can cause denial of service since symbols are not removed by the
garbage collector.

Fixes: CVE-2014-0082
 2014-02-18 15:02:54 -03:00
Rafael Mendonça França
eaa2101b29 Escape format, negative_format and units options of number helpers 
Previously the values of these options were trusted leading to
potential XSS vulnerabilities.

Fixes: CVE-2014-0081
 2014-02-18 15:02:29 -03:00
Josef Šimánek
c13eb1c727 Fix force_ssl.rb documentation. Close tt tag. 
[ci skip]
 2014-01-06 15:28:35 +01:00
Carlos Antonio da Silva
31a485fa5a Merge pull request #13183 from sorah/never_ignore_i18n_translate_raise_option 
Escalate missing error when :raise is true in translate helper, fix regression introduced by security fix.

Conflicts:
	actionpack/CHANGELOG.md
 2013-12-04 22:34:15 -02:00
Rafael Mendonça França
c82025fcd6 Fix documentation of number_to_currency helper 
Now users have to explicit mark the unit as safe if they trust it.

Closes #13161
 2013-12-04 10:22:46 -02:00
Tobias Kraze
9e625d6465 repair a test broken by the number_to_currency XSS fix 2013-12-04 12:16:05 +01:00
Aaron Patterson
64226302d8 updating the changelog 2013-12-02 16:17:19 -08:00
Michael Koziarski
d5a4095ca5 Deep Munge the parameters for GET and POST 
The previous implementation of this functionality could be accidentally
subverted by instantiating a raw Rack::Request before the first Rails::Request
was constructed.

Fixes CVE-2013-6417

Conflicts:
	actionpack/lib/action_dispatch/http/request.rb
 2013-12-02 14:14:35 -08:00
Michael Koziarski
78790e4bce Stop using i18n's built in HTML error handling. 
i18n doesn't depend on active support which means it can't use our html_safe
code to do its escaping when generating the spans.  Rather than try to sanitize
the output from i18n, just revert to our old behaviour of rescuing the error
and constructing the tag ourselves.

Fixes: CVE-2013-4491

Conflicts:
	actionpack/lib/action_view/helpers/translation_helper.rb

Backport: 50afd8eec9d088ad5a2d41f00a05520d5b78a6a0
 2013-12-02 14:02:15 -08:00
Michael Koziarski
5ed70c591f Escape the unit value provided to number_to_currency 
Fixes CVE-2013-6415

Previously the values were trusted blindly allowing for potential XSS attacks.
 2013-12-02 13:49:41 -08:00
Aaron Patterson
bee3b7f937 Only use valid mime type symbols as cache keys 
CVE-2013-6414
 2013-11-30 17:03:18 -08:00
Aaron Patterson
538f8ba0c1 updating changelogs 2013-10-16 10:01:01 -07:00
Aaron Patterson
2a0c4403fd bumping to 3.2.15 2013-10-15 11:48:53 -07:00
Aaron Patterson
eb8807e84d Merge branch '3-2-15' into 3-2-sec 
* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939
 2013-10-15 11:15:08 -07:00
Aaron Patterson
e3abd78ee5 bumping to rc3 2013-10-11 14:16:06 -07:00