Merge branch 'main' into lbaker/update-frequenttasks

chef · Jul 18, 2022 · e98dd3d · e98dd3d
2 parents 118cc4f + 7cfc438
commit e98dd3d
Show file tree

Hide file tree

Showing 14 changed files with 60 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,16 +1,22 @@
 # Chef Server Changelog
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 15.0.18 -->
-## [15.0.18](https://github.com/chef/chef-server/tree/15.0.18) (2022-06-29)
+<!-- latest_release 15.0.24 -->
+## [15.0.24](https://github.com/chef/chef-server/tree/15.0.24) (2022-07-18)
 
 #### Merged Pull Requests
-- Bump pg from 1.3.5 to 1.4.1 in /src/chef-server-ctl [#3383](https://github.com/chef/chef-server/pull/3383) ([dependabot[bot]](https://github.com/dependabot[bot]))
+- Bump rails-html-sanitizer from 1.4.2 to 1.4.3 in /src/oc-id [#3396](https://github.com/chef/chef-server/pull/3396) ([dependabot[bot]](https://github.com/dependabot[bot]))
 <!-- latest_release -->
 
 <!-- release_rollup since=15.0.9 -->
 ### Changes since 15.0.9 release
 
 #### Merged Pull Requests
+- Bump rails-html-sanitizer from 1.4.2 to 1.4.3 in /src/oc-id [#3396](https://github.com/chef/chef-server/pull/3396) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.24 -->
+- Bump test-kitchen from 3.2.2 to 3.3.1 in /omnibus [#3394](https://github.com/chef/chef-server/pull/3394) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.23 -->
+- Bump redis from 4.7.0 to 4.7.1 in /src/chef-server-ctl [#3392](https://github.com/chef/chef-server/pull/3392) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.22 -->
+- Clarify tls_enabled usage [#3411](https://github.com/chef/chef-server/pull/3411) ([sean-horn](https://github.com/sean-horn)) <!-- 15.0.21 -->
+- Bump activesupport from 7.0.3 to 7.0.3.1 in /oc-chef-pedant [#3403](https://github.com/chef/chef-server/pull/3403) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.20 -->
+- Upgrade dependencies 2 [#3368](https://github.com/chef/chef-server/pull/3368) ([lbakerchef](https://github.com/lbakerchef)) <!-- 15.0.19 -->
 - Bump pg from 1.3.5 to 1.4.1 in /src/chef-server-ctl [#3383](https://github.com/chef/chef-server/pull/3383) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.18 -->
 - Bump octokit from 4.24.0 to 4.25.0 in /src/chef-server-ctl [#3371](https://github.com/chef/chef-server/pull/3371) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.17 -->
 - Bump pg from 1.3.5 to 1.4.1 in /src/oc-id [#3386](https://github.com/chef/chef-server/pull/3386) ([dependabot[bot]](https://github.com/dependabot[bot])) <!-- 15.0.16 -->

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-15.0.18
+15.0.24
diff --git a/docs-chef-io/layouts/shortcodes/chef-server/config_rb_server_settings_ldap.md b/docs-chef-io/layouts/shortcodes/chef-server/config_rb_server_settings_ldap.md
@@ -125,7 +125,7 @@ This configuration file has the following settings for `ldap`:
 
 `ldap['ssl_enabled']`
 
-:   Cause the Chef Infra Server to connect to the LDAP server using SSL.
+:   Cause the Chef Infra Server to connect to the LDAP server using SSL. Synonymous with simple_tls
     Default value: `false`. Must be `false` when `ldap['tls_enabled']`
     is `true`.
 
@@ -176,7 +176,7 @@ This configuration file has the following settings for `ldap`:
 `ldap['tls_enabled']`
 
 :   Enable TLS. When enabled, communication with the LDAP server is done
-    using a secure SSL connection on a dedicated port. When `true`,
+    using a secure SSL connection on a dedicated port. Synonymous with STARTTLS. This mode is rarely used. When `true`,
     `ldap['port']` is also set to `636`. Default value: `false`. Must be
     `false` when `ldap['ssl_enabled']` is `true`.
 

diff --git a/oc-chef-pedant/Gemfile.lock b/oc-chef-pedant/Gemfile.lock
@@ -19,7 +19,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.3)
+    activesupport (7.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -140,7 +140,7 @@ GEM
     http-cookie (1.0.4)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     iniparse (1.5.0)
     inspec-core (4.56.19)
@@ -183,7 +183,7 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    minitest (5.15.0)
+    minitest (5.16.2)
     mixlib-archive (1.1.7)
       mixlib-log
     mixlib-authentication (3.0.10)

diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
@@ -208,7 +208,7 @@ GEM
     mixlib-cli (2.1.8)
     mixlib-config (3.0.9)
       tomlrb
-    mixlib-install (3.12.16)
+    mixlib-install (3.12.19)
       mixlib-shellout
       mixlib-versioning
       thor
@@ -298,7 +298,7 @@ GEM
       unicode_utils (~> 1.4)
     strings-ansi (0.2.0)
     syslog-logger (1.6.8)
-    test-kitchen (3.2.2)
+    test-kitchen (3.3.1)
       bcrypt_pbkdf (~> 1.0)
       chef-utils (>= 16.4.35)
       ed25519 (~> 1.2)
@@ -345,7 +345,7 @@ GEM
       pastel (~> 0.8)
       strings (~> 0.2.0)
       tty-screen (~> 0.8)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.2.0)
     unicode_utils (1.4.0)
     uuidtools (2.2.0)
     vault (0.17.0)

diff --git a/src/bookshelf/rebar.config b/src/bookshelf/rebar.config
@@ -29,7 +29,7 @@
     {meck, ".*",
         {git, "https://github.com/eproxus/meck",                    {branch, "master"}}},
     {mini_s3, ".*",
-        {git, "https://github.com/chef/mini_s3",                    {branch, "master"}}},
+        {git, "https://github.com/chef/mini_s3",                    {branch, "main"}}},
     {mixer, ".*",
         {git, "https://github.com/inaka/mixer",                     {branch, "master"}}},
     {mochiweb, ".*",

diff --git a/src/bookshelf/rebar.lock b/src/bookshelf/rebar.lock
@@ -1,4 +1,4 @@
-{"1.1.0",
+{"1.2.0",
 [{<<"base16">>,{pkg,<<"base16">>,<<"1.0.0">>},1},
  {<<"cf">>,
   {git,"https://github.com/project-fifo/cf",
@@ -27,7 +27,7 @@
   1},
  {<<"erlcloud">>,
   {git,"https://github.com/chef/erlcloud",
-       {ref,"83f4291c3ad6e72e237e49fb42b301236a997f08"}},
+       {branch,"lbaker/presigned"}},
   0},
  {<<"erlsom">>,
   {git,"https://github.com/chef/erlsom",
@@ -63,7 +63,7 @@
   0},
  {<<"mini_s3">>,
   {git,"https://github.com/chef/mini_s3",
-       {ref,"8a6b80ec60be799c5f69d9b2f22eb0af55b4dc77"}},
+       {ref,"37568badf2a40c92742c5519e220829bc7a32a56"}},
   0},
  {<<"mixer">>,
   {git,"https://github.com/inaka/mixer",

diff --git a/src/chef-server-ctl/Gemfile.lock b/src/chef-server-ctl/Gemfile.lock
@@ -309,7 +309,7 @@ GEM
     rack (2.2.3.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    redis (4.7.0)
+    redis (4.7.1)
     regexp_parser (2.2.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)

diff --git a/src/oc-id/Gemfile.lock b/src/oc-id/Gemfile.lock
@@ -404,7 +404,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
     railties (6.1.4.6)
       actionpack (= 6.1.4.6)

diff --git a/src/oc_erchef/apps/chef_index/src/chef_index_query.erl b/src/oc_erchef/apps/chef_index/src/chef_index_query.erl
@@ -86,7 +86,7 @@ check_query(RawQuery) ->
             %% thou shalt not query with the empty string
             throw({bad_query, ""});
         Query ->
-            transform_query(http_uri:decode(Query))
+            transform_query(http_uri_decode(Query))
     end.
 
 transform_query(RawQuery) when is_list(RawQuery) ->
@@ -106,7 +106,8 @@ decode({nonneg_int, Key}, Val, Default) ->
                 {Default, default};
             Value ->
                 try
-                    {list_to_integer(http_uri:decode(Value)), Value}
+                    % @mp: remove http_uri_decode here, or keep it?
+                    {list_to_integer(http_uri_decode(Value)), Value}
                 catch
                     error:badarg ->
                         throw({bad_param, {Key, Value}})
@@ -133,3 +134,30 @@ search_db_from_orgid(OrgId) ->
 
 db_from_orgid(OrgId) ->
     "chef_" ++ binary_to_list(OrgId).
+
+hex2dec(X) when (X>=$0) andalso (X=<$9) -> X-$0;
+hex2dec(X) when (X>=$A) andalso (X=<$F) -> X-$A+10;
+hex2dec(X) when (X>=$a) andalso (X=<$f) -> X-$a+10.
+
+-type maybe_hex_uri() :: string() | binary(). %% A possibly hexadecimal encoded URI.
+-type uri() :: string() | binary().
+
+-spec http_uri_decode(maybe_hex_uri()) -> uri().
+http_uri_decode(String) when is_list(String) ->
+    do_decode(String);
+http_uri_decode(String) when is_binary(String) ->
+    do_decode_binary(String).
+
+do_decode([$%,Hex1,Hex2|Rest]) ->
+    [hex2dec(Hex1)*16+hex2dec(Hex2)|do_decode(Rest)];
+do_decode([First|Rest]) ->
+    [First|do_decode(Rest)];
+do_decode([]) ->
+    [].
+
+do_decode_binary(<<$%, Hex:2/binary, Rest/bits>>) ->
+    <<(binary_to_integer(Hex, 16)), (do_decode_binary(Rest))/binary>>;
+do_decode_binary(<<First:1/binary, Rest/bits>>) ->
+    <<First/binary, (do_decode_binary(Rest))/binary>>;
+do_decode_binary(<<>>) ->
+    <<>>.
diff --git a/src/oc_erchef/apps/data_collector/rebar.lock b/src/oc_erchef/apps/data_collector/rebar.lock
@@ -15,7 +15,7 @@
   0},
  {<<"opscoderl_httpc">>,
   {git,"https://github.com/chef/opscoderl_httpc",
-       {ref,"d9578f44726ca69af5bdadaa602756692d3b1460"}},
+       {ref,"3cdc661e55a48af321b7097941b9a03e8d7b113f"}},
   0},
  {<<"pooler">>,
   {git,"https://github.com/chef/pooler",

diff --git a/src/oc_erchef/apps/oc_chef_authz/src/oc_chef_authz.app.src b/src/oc_erchef/apps/oc_chef_authz/src/oc_chef_authz.app.src
@@ -23,6 +23,7 @@
   {applications, [kernel,
                   stdlib,
                   stats_hero,
+                  chef_objects,
                   chef_db]},
   {mod, {oc_chef_authz_app, []}}
  ]}.
diff --git a/src/oc_erchef/apps/oc_chef_wm/src/chef_wm_search.erl b/src/oc_erchef/apps/oc_chef_wm/src/chef_wm_search.erl
@@ -118,7 +118,7 @@ handle_undefined_start(Start, _Req) ->
 decode(undefined) ->
     0;
 decode(Val) ->
-    list_to_integer(http_uri:decode(Val)).
+    list_to_integer(Val).
 
 to_json(Req, #base_state{chef_db_context = DbContext,
                          resource_state = SearchState,

diff --git a/src/oc_erchef/rebar.lock b/src/oc_erchef/rebar.lock
@@ -51,7 +51,7 @@
   1},
  {<<"erlcloud">>,
   {git,"https://github.com/chef/erlcloud",
-       {ref,"83f4291c3ad6e72e237e49fb42b301236a997f08"}},
+       {branch,"lbaker/presigned"}},
   0},
  {<<"erlware_commons">>,
   {git,"https://github.com/chef/erlware_commons",
@@ -86,7 +86,7 @@
   1},
  {<<"mini_s3">>,
   {git,"https://github.com/chef/mini_s3",
-       {ref,"8a6b80ec60be799c5f69d9b2f22eb0af55b4dc77"}},
+       {ref,"37568badf2a40c92742c5519e220829bc7a32a56"}},
   0},
  {<<"mixer">>,
   {git,"https://github.com/inaka/mixer",
@@ -110,7 +110,7 @@
   0},
  {<<"opscoderl_httpc">>,
   {git,"https://github.com/chef/opscoderl_httpc",
-       {ref,"58efd00f9e21f119890a3b105089878140ecd6fe"}},
+       {ref,"3cdc661e55a48af321b7097941b9a03e8d7b113f"}},
   0},
  {<<"opscoderl_wm">>,
   {git,"https://github.com/chef/opscoderl_wm",