aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Deprecate secret_token, long since usurped by secret_key_base.Kasper Timm Hansen2017-09-282-0/+32
| | | | | | | | | | See the changelog entry. Remove `secrets.secret_token` from the bug report templates, since we don't accept bug reports for Rails versions that don't support a `secret_key_base`. [ claudiob & Kasper Timm Hansen ]
* Merge pull request #30729 from yalab/nested_scaffoldAaron Patterson2017-09-276-10/+75
|\ | | | | Nested scaffold should be fine
| * scaffold nested name controller should be fine.yalab2017-09-276-10/+75
| |
* | Merge pull request #30614 from kami-zh/yarn-on-bin-updateJavan Makhmali2017-09-271-0/+5
|\ \ | |/ |/| Align `bin/update`'s Yarn usage with `bin/setup`
| * Install JavaScript dependencies on updatekami-zh2017-09-161-0/+5
| |
* | Remove unused fixturesyuuji.yaginuma2017-09-263-7/+0
| | | | | | | | `about_yml_plugins` is no longer used since 82b9b15
* | Merge pull request #30700 from y-yagi/respect_quiet_optionKasper Timm Hansen2017-09-253-17/+22
|\ \ | | | | | | Respect quiet option in all process of `rails new` command
| * | Respect quiet option in all process of `rails new` commandyuuji.yaginuma2017-09-253-17/+22
| | | | | | | | | | | | | | | If specify the `quiet` option, expect that no status will be shown. However, some process show status. This suppresses all status output.
* | | Fix cookies/session tests broken after merging key rotation.Kasper Timm Hansen2017-09-252-35/+31
|/ / | | | | | | | | | | | | | | | | | | | | | | Based on, yet closes https://github.com/rails/rails/pull/30708 Fix the session test by properly truncating the legacy encryption key for cbc encryption. Borrowed straight from 👆. Fix the cookies test a little differently than the PR. Basically keep every config within the config block. [ Michael Coyne & Kasper Timm Hansen ]
* | Skip complex cookie tests for now; I'll deal with them tomorrow.Kasper Timm Hansen2017-09-242-0/+6
| |
* | Merge pull request #30693 from yhirano55/refactor_css_scaffold_generatorKasper Timm Hansen2017-09-241-3/+3
|\ \ | | | | | | Refactor Css::Generators::ScaffoldGenerator
| * | Refactor Css::Generators::ScaffoldGeneratorYoshiyuki Hirano2017-09-251-3/+3
| | | | | | | | | | | | | | | * define source_root by source_root method * it don't create file, but copy it.
* | | Add key rotation cookies middlewareMichael Coyne2017-09-241-0/+1
| | | | | | | | | | | | | | | | | | Using the action_dispatch.cookies_rotations interface, key rotation is now possible with cookies. Thus the secret_key_base as well as salts, ciphers, and digests, can be rotated without expiring sessions.
* | | Add key rotation message Encryptor and VerifierMichael Coyne2017-09-232-1/+147
|/ / | | | | | | | | | | Both classes now have a rotate method where new instances are added for each call. When decryption or verification fails the next rotation instance is tried.
* | Use `TOPLEVEL_BINDING` in rails runner commandyuuji.yaginuma2017-09-222-2/+14
| | | | | | | | | | | | | | | | | | Binding to capture the local scope. This means that if a constant with same name as constant specified by the user exists in local scope, constant defined in local will use. This is different from what the user expects. Therefore, fixed to use top-level binding instead of local scope. Fixes #30644
* | Merge pull request #30657 from yhirano55/fix_restful_wordingRyuta Kamizono2017-09-201-1/+1
|\ \ | | | | | | Use RESTful instead of restful
| * | Use RESTful instead of restfulYoshiyuki Hirano2017-09-201-1/+1
| | |
* | | Use credentials in `storage.yml` templateyuuji.yaginuma2017-09-201-1/+1
| | | | | | | | | | | | Follow up of #30650
* | | Use credentials, not secrets, for Active Storage (#30650)Claudio B2017-09-192-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to #30067: > This PR will deprecate secrets.yml* and instead adopt > config/credentials.yml.enc to signify what these secrets are specifically > for: Keeping API keys, database passwords, and any other integration > credentials in one place. [ci skip] since only comments are being edited.
* | | Use the default Capybara registered puma server configurationThomas Walpole2017-09-181-1/+1
|/ /
* | Add `mini_magick` to default `Gemfile` as commentYoshiyuki Hirano2017-09-172-0/+7
| | | | | | | | | | | | * If we want to transform image on ActiveStorage, we should bundle `mini_magick`. * I've added comment block to default `Gemfile` to be easier to install this.
* | Merge pull request #30609 from y-yagi/add_tests_for_credentials_commandKasper Timm Hansen2017-09-171-0/+19
|\ \ | | | | | | Add tests for credentials command
| * | Add tests for credentials commandyuuji.yaginuma2017-09-151-0/+19
| |/
* | Merge pull request #30625 from ↵Ryuta Kamizono2017-09-1712-24/+0
|\ \ | | | | | | | | | | | | y-yagi/remove_frozen_string_literal_from_templates Remove frozen_string_literal magic comment from templates
| * | Remove frozen_string_literal magic comment from templatesyuuji.yaginuma2017-09-1712-24/+0
| |/ | | | | | | Follow up of #30348
* / Don't expose Active Storage routesyuuji.yaginuma2017-09-161-28/+13
|/ | | | | | | These routes are only used internally in Active Storage, and it seems that there is no need for the user to directly use them. Therefore, I think that routes should not be exposed to users.
* Inline the lone add_master_key_file_silently use.Kasper Timm Hansen2017-09-141-5/+1
|
* Merge pull request #30582 from y-yagi/do_no_add_master_key_and_credentialsKasper Timm Hansen2017-09-141-0/+4
|\ | | | | Do not add master key and credentials when `pretend` option is specified
| * Do not add master key and credentials when `pretend` option is specifiedyuuji.yaginuma2017-09-121-0/+4
| |
* | Merge pull request #30581 from y-yagi/do_not_add_master_key_twice_to_gitignoreKasper Timm Hansen2017-09-144-17/+45
|\ \ | | | | | | Make master key added to gitignore the same value as when creating appplication
| * | Make master key added to gitignore the same value as when creating appplicationyuuji.yaginuma2017-09-144-17/+45
| |/ | | | | | | | | | | | | | | | | For gitignore generated by `rails new`, key with a leading slash is specified. https://github.com/rails/rails/blob/69f976b859cae7f9d050152103da018b7f5dda6d/railties/lib/rails/generators/rails/app/templates/gitignore#L11 Therefore, when executing `credentials:edit`, also need leading slack. In order to avoid such a difference, fixed to use same method for `rails new` and `credentials:edit`.
* | [ci skip] Prefer credentials to secrets in docs.Kasper Timm Hansen2017-09-132-3/+3
| | | | | | | | | | | | | | Removes most mentions of secrets.secret_key_base and explains credentials instead. Also removes some very stale upgrade notices about Rails 3/4.
* | Use escaped character in regexpyhirano552017-09-111-1/+1
|/
* Add credentials using a generic EncryptedConfiguration class (#30067)David Heinemeier Hansson2017-09-1120-115/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * WIP: Add credentials using a generic EncryptedConfiguration class This is sketch code so far. * Flesh out EncryptedConfiguration and test it * Better name * Add command and generator for credentials * Use the Pathnames * Extract EncryptedFile from EncryptedConfiguration and add serializers * Test EncryptedFile * Extract serializer validation * Stress the point about losing comments * Allow encrypted configuration to be read without parsing for display * Use credentials by default and base them on the master key * Derive secret_key_base in test/dev, source it from credentials in other envs And document the usage. * Document the new credentials setup * Stop generating the secrets.yml file now that we have credentials * Document what we should have instead Still need to make it happen, tho. * [ci skip] Keep wording to `key base`; prefer defaults. Usually we say we change defaults, not "spec" out a release. Can't use backticks in our sdoc generated documentation either. * Abstract away OpenSSL; prefer MessageEncryptor. * Spare needless new when raising. * Encrypted file test shouldn't depend on subclass. * [ci skip] Some woordings. * Ditch serializer future coding. * I said flip it. Flip it good. * [ci skip] Move require_master_key to the real production.rb. * Add require_master_key to abort the boot process. In case the master key is required in a certain environment we should inspect that the key is there and abort if it isn't. * Print missing key message and exit immediately. Spares us a lengthy backtrace and prevents further execution. I've verified the behavior in a test app, but couldn't figure the test out as loading the app just exits immediately with: ``` /Users/kasperhansen/Documents/code/rails/activesupport/lib/active_support/testing/isolation.rb:23:in `load': marshal data too short (ArgumentError) from /Users/kasperhansen/Documents/code/rails/activesupport/lib/active_support/testing/isolation.rb:23:in `run' from /Users/kasperhansen/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/minitest-5.10.2/lib/minitest.rb:830:in `run_one_method' from /Users/kasperhansen/.rbenv/versions/2.4.1/lib/ruby/gems/2.4.0/gems/minitest-5.10.2/lib/minitest/parallel.rb:32:in `block (2 levels) in start' ``` It's likely we need to capture and prevent the exit somehow. Kernel.stub(:exit) didn't work. Leaving it for tomorrow. * Fix require_master_key config test. Loading the app would trigger the `exit 1` per require_master_key's semantics, which then aborted the test. Fork and wait for the child process to finish, then inspect the exit status. Also check we aborted because of a missing master key, so something else didn't just abort the boot. Much <3 to @tenderlove for the tip. * Support reading/writing configs via methods. * Skip needless deep symbolizing. * Remove save; test config reader elsewhere. * Move secret_key_base check to when we're reading it. Otherwise we'll abort too soon since we don't assign the secret_key_base to secrets anymore. * Add missing string literal comments; require unneeded yaml require. * ya ya ya, rubocop. * Add master_key/credentials after bundle. Then we can reuse the existing message on `rails new bc4`. It'll look like: ``` Using web-console 3.5.1 from https://github.com/rails/web-console.git (at master@ce985eb) Using rails 5.2.0.alpha from source at `/Users/kasperhansen/Documents/code/rails` Using sass-rails 5.0.6 Bundle complete! 16 Gemfile dependencies, 72 gems now installed. Use `bundle info [gemname]` to see where a bundled gem is installed. Adding config/master.key to store the master encryption key: 97070158c44b4675b876373a6bc9d5a0 Save this in a password manager your team can access. If you lose the key, no one, including you, can access anything encrypted with it. create config/master.key ``` And that'll be executed even if `--skip-bundle` was passed. * Ensure test app has secret_key_base. * Assign secret_key_base to app or omit. * Merge noise * Split options for dynamic delegation into its own method and use deep symbols to make it work * Update error to point to credentials instead * Appease Rubocop * Validate secret_key_base when reading it. Instead of relying on the validation in key_generator move that into secret_key_base itself. * Fix generator and secrets test. Manually add config.read_encrypted_secrets since it's not there by default anymore. Move mentions of config/secrets.yml to config/credentials.yml.enc. * Remove files I have no idea how they got here. * [ci skip] swap secrets for credentials. * [ci skip] And now, changelogs are coming.
* Remove needless `silence_warnings`yuuji.yaginuma2017-09-093-17/+3
| | | | Since ff30db1, warning is not shown.
* Remove unused `fork` arg for `rails`yuuji.yaginuma2017-09-081-4/+2
|
* Reorganize secrets test to use only `isolation/abstract_unit`yuuji.yaginuma2017-09-071-14/+18
| | | | | | | | Currently, secrets test uses `abstract_unit` and `isolation/abstract_unit`. This is a bit odd. Therefore, reorganize it so that use only `isolation/abstract_unit`. Context: https://github.com/rails/rails/pull/30520#issuecomment-327409586
* Merge pull request #30520 from rails/railties-rails-commandMatthew Draper2017-09-0521-289/+339
|\ | | | | Run in-app rails commands via fork+load where possible
| * Run in-app rails commands via fork+load where possibleMatthew Draper2017-09-0421-289/+339
| | | | | | | | | | While this avoids shell argument parsing, we still pass through everything in our stack.
* | Explicitly require `test_unit/reporter` in test helperyuuji.yaginuma2017-09-042-0/+7
|/ | | | | | | | | | | If the user used the `bin/test` to execute the test, this file is automatically loaded, so require is unnecessary. https://github.com/rails/rails/blob/acea68de026ba657cb65c4dd0fc1f24ba67e1cf8/railties/lib/rails/plugin/test.rb#L4 However, when using `rake test`, an explicit require is required because the above file is not loaded. Fixes #30516
* Don't need the layout hereMatthew Draper2017-09-041-0/+2
|
* Preload some additional specific filesMatthew Draper2017-09-041-0/+3
|
* Preload Rails component gems in railties testsMatthew Draper2017-09-044-2/+22
|
* Run all railties tests before reporting failureMatthew Draper2017-09-031-1/+14
|
* Don't start a new process for every test fileMatthew Draper2017-09-031-10/+34
| | | | | This effectively reverts 200cf32e207728df287cac2ec113a7cbe277c1eb, restoring a variant of 5a0e0e72995472e315738dcea5b5a12d6e3d3489.
* Remove needless `silence_warnings`yuuji.yaginuma2017-09-011-4/+1
| | | | Since ff30db1, warning is not show.
* Merge pull request #30323 from yhirano55/support_multiple_version_for_gem_methodMatthew Draper2017-08-313-9/+25
|\ | | | | Support multiple versions arguments for `gem` method of Generators
| * Support multiple versions arguments for `gem` method of GeneratorsYoshiyuki Hirano2017-08-193-9/+25
| |
* | Update RDOC_MAIN.rdoc [ci skip]Yoshiyuki Hirano2017-08-311-42/+60
| |
* | Fix `can't modify frozen String` error in `DBConsole`yuuji.yaginuma2017-08-292-1/+7
| | | | | | | | | | | | | | | | | | Without this, `dbconsole` raises an error as follwing: ``` RuntimeError: can't modify frozen String railties/lib/rails/commands/dbconsole/dbconsole_command.rb:79:in `start' ```
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-26 07:46:33 +0000