Issue #33677: Replace use of whitelist with allowlist and blacklist with denylist #33678
Conversation
|
Thanks for the pull request, and welcome! The Rails team is excited to review your changes, and you should hear from @georgeclaghorn (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. This repository is being automatically checked for code quality issues using Code Climate. You can see results for this analysis in the PR status below. Newly introduced issues should be fixed before a Pull Request is considered ready to review. Please see the contribution instructions for more information. |
|
@rafaelfranca it looks like a newer PR that does the same thing was reviewed instead. Did I do anything incorrectly when submitting? |
|
Urgh, sorry. I only saw the other one. But don't worry, I'll make sure you get credits for the change too. |
| @@ -14,7 +14,7 @@ class ERB | |||
| class_attribute :erb_implementation, default: Erubi | |||
|
|
|||
| # Do not escape templates of these mime types. | |||
| class_attribute :escape_whitelist, default: ["text/plain"] | |||
There was a problem hiding this comment.
Since this is public, don't think we should just blanket change this. We can add
[self, singleton_class].each do |base|
base.alias_method :escape_whitelist, :escape_allowlist
base.alias_method :escape_whitelist=, :escape_allowlist=
base.deprecate(
escape_whitelist: 'use #escape_whitelist instead',
:escape_whitelist= => 'use #escape_whitelist= instead'
)
endto deprecate until the next version
| @@ -1200,7 +1200,7 @@ to the database as `NULL` instead of passing the `nil` value through YAML (`"--- | |||
| * Rails 4.0 has removed `attr_accessible` and `attr_protected` feature in favor of Strong Parameters. You can use the [Protected Attributes gem](https://github.com/rails/protected_attributes) for a smooth upgrade path. | |||
|
|
|||
| * If you are not using Protected Attributes, you can remove any options related to | |||
| this gem such as `whitelist_attributes` or `mass_assignment_sanitizer` options. | |||
| this gem such as `allowlist_attributes` or `mass_assignment_sanitizer` options. | |||
There was a problem hiding this comment.
This was a method at the time, so this shouldn't change.
| @@ -888,7 +888,7 @@ do that with `local_variables`. | |||
|
|
|||
| ### Settings | |||
|
|
|||
| * `config.web_console.whitelisted_ips`: Authorized list of IPv4 or IPv6 | |||
| * `config.web_console.allowlisted_ips`: Authorized list of IPv4 or IPv6 | |||
There was a problem hiding this comment.
These options are passed directly on to web console, and whitelisted_ips didn't change over there so this needs to stay the same.
|
Thanks for checking anyway @rafaelfranca @kddeisz ! Looks like most of the terminology discussion is going on in #33681 so I'll close this up. |
Summary
enforce_raw_sql_whitelistin favor ofenforce_raw_sql_allowlist.ActiveJob::Arguments:TYPE_WHITELISTtoTYPE_ALLOWLISTActionController::Live::SSE:WHITELISTED_OPTIONStoALLOWLISTED_OPTIONSActionView::Template::Handlers::ERB:escape_whitelisttoescape_allowlistActiveRecord::AttributeMethods:BLACKLISTED_CLASS_METHODStoDENYLISTED_CLASS_METHODSActiveRecord::AttributeMethods::GeneratedAttributeMethods:COLUMN_NAME_ORDER_WHITELISTtoCOLUMN_NAME_ORDER_ALLOWLISTActiveRecord::AttributeMethods::ClassMethods:COLUMN_NAME_WHITELISTtoCOLUMN_NAME_ALLOWLISTOther Information
Fixes #33677