-
Notifications
You must be signed in to change notification settings - Fork 3.5k
Add __escape__/1 and use it to fix Regex escaping in OTP28.1 #14720
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from 7 commits
f47e748
bf77434
602096f
6ef94c5
c3be329
f490780
5814e03
8b0e498
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1000,4 +1000,45 @@ defmodule Regex do | |
|
||
defp translate_options(<<>>, acc), do: acc | ||
defp translate_options(t, _acc), do: {:error, t} | ||
|
||
@doc false | ||
def __escape__(%{__struct__: Regex} = regex) do | ||
# OTP 28.0 introduced refs in patterns, which can't be used in AST anymore | ||
# OTP 28.1 introduced :re.import/1 which allows us to work with pre-compiled binaries again | ||
|
||
pattern_ast = | ||
cond do | ||
# TODO: Remove this when we require Erlang/OTP 28+ | ||
# Before OTP 28.0, patterns did not contain any refs and could be safely be escaped | ||
:erlang.system_info(:otp_release) < [?2, ?8] -> | ||
Macro.escape(regex.re_pattern) | ||
|
||
# OTP 28.1+ introduced the ability to export and import regexes from compiled binaries | ||
Code.ensure_loaded?(:re) and function_exported?(:re, :import, 1) -> | ||
{:ok, exported} = :re.compile(regex.source, [:export] ++ regex.opts) | ||
|
||
quote do | ||
:re.import(unquote(Macro.escape(exported))) | ||
end | ||
|
||
# TODO: Remove this when we require Erlang/OTP 28.1+ | ||
# OTP 28.0 works in degraded mode performance-wise, we need to recompile from the source | ||
true -> | ||
quote do | ||
{:ok, pattern} = | ||
:re.compile(unquote(Macro.escape(regex.source)), unquote(Macro.escape(regex.opts))) | ||
|
||
pattern | ||
end | ||
end | ||
Comment on lines
+1025
to
+1033
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Was wondering. Perhaps we could/should warn here, so that people notice and pro-actively bump to OTP28.1? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, warning sounds good to me! There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hum I tried e1907ea but it seems to cause some bootstrapping issues. Not too familiar with There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So let's warn on boot in elixir.erl. Check if version is >= 28 and the import function is not available. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This seems to work, but would break too many integration tests in the CI? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @sabiwara I think for CI we will run on 28.1. So perhaps we add the warning in a separate PR, which we will merge once we move CI to 28.1. WDYT? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Adding the warning separately sounds good! 💜 |
||
|
||
quote do | ||
%{ | ||
__struct__: unquote(Regex), | ||
re_pattern: unquote(pattern_ast), | ||
source: unquote(Macro.escape(regex.source)), | ||
opts: unquote(Macro.escape(regex.opts)) | ||
} | ||
end | ||
end | ||
end |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,9 @@ | |
%% SPDX-FileCopyrightText: 2012 Plataformatec | ||
|
||
-module(elixir_quote). | ||
|
||
-feature(maybe_expr, enable). | ||
|
||
-export([escape/3, linify/3, linify_with_context_counter/3, build/7, quote/2, has_unquotes/1, fun_to_quoted/1]). | ||
-export([dot/5, tail_list/3, list/2, validate_runtime/2, shallow_validate_ast/1]). %% Quote callbacks | ||
|
||
|
@@ -169,8 +172,17 @@ do_escape(BitString, _) when is_bitstring(BitString) -> | |
end; | ||
|
||
do_escape(Map, Q) when is_map(Map) -> | ||
TT = [escape_map_key_value(K, V, Map, Q) || {K, V} <- lists:sort(maps:to_list(Map))], | ||
{'%{}', [], TT}; | ||
maybe | ||
#{'__struct__' := Module} ?= Map, | ||
true ?= is_atom(Module), | ||
{module, Module} ?= code:ensure_loaded(Module), | ||
true ?= erlang:function_exported(Module, '__escape__', 1), | ||
Module:'__escape__'(Map) | ||
else | ||
_ -> | ||
TT = [escape_map_key_value(K, V, Map, Q) || {K, V} <- lists:sort(maps:to_list(Map))], | ||
{'%{}', [], TT} | ||
end; | ||
Comment on lines
+175
to
+185
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Note: We can finally use Since we're requiring OTP26, there is no runtime flag anymore, just the module one. |
||
|
||
do_escape([], _) -> | ||
[]; | ||
|
@@ -216,7 +228,7 @@ escape_map_key_value(K, V, Map, Q) -> | |
"(it must be defined within a function instead). ", (bad_escape_hint())/binary>>); | ||
true -> | ||
{do_quote(K, Q), do_quote(V, Q)} | ||
end. | ||
end. | ||
|
||
find_tuple_ref(Tuple, Index) when Index > tuple_size(Tuple) -> nil; | ||
find_tuple_ref(Tuple, Index) -> | ||
|
Uh oh!
There was an error while loading. Please reload this page.