Merge pull request #600 from utPLSQL/feature/fix_dbms_crypto_privs_requirements

pesse · web-flow · commit fc5f305f9738 · 2018-03-07T10:55:15.000+01:00
Fixed bad placement of calls to dbms_crypto.
diff --git a/.travis/install.sh b/.travis/install.sh
@@ -32,5 +32,6 @@ set feedback off
 set feedback on
 --Needed for testing coverage outside of main UT3 schema.
 grant create any procedure, drop any procedure, execute any procedure, create any type, drop any type, execute any type, under any type, select any table, update any table, insert any table, delete any table, create any table, drop any table, alter any table, select any dictionary to $UT3_TESTER;
+revoke execute on dbms_crypto from $UT3_TESTER;
 exit
 SQL
diff --git a/source/expectations/data_values/ut_compound_data_diff_tmp.sql b/source/expectations/data_values/ut_compound_data_diff_tmp.sql
@@ -12,7 +12,7 @@ create global temporary table ut_compound_data_diff_tmp(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  diff_id    raw(16),
+  diff_id    raw(128),
   item_no    integer,
   constraint ut_compound_data_diff_tmp_pk primary key(diff_id,item_no)
 ) on commit preserve rows;
diff --git a/source/expectations/data_values/ut_compound_data_helper.pkb b/source/expectations/data_values/ut_compound_data_helper.pkb
@@ -216,6 +216,33 @@ create or replace package body ut_compound_data_helper is
     return l_results;
   end;
 
+  function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is
+  begin
+    return dbms_crypto.hash(a_data, a_hash_type);
+  end;
+
+  function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash is
+  begin
+    return dbms_crypto.hash(a_data, a_hash_type);
+  end;
+
+  function columns_hash(
+    a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2,
+    a_hash_type binary_integer := dbms_crypto.hash_sh1
+  ) return t_hash is
+    l_cols_hash t_hash;
+  begin
+    if not a_data_value_cursor.is_null then
+      execute immediate
+      q'[select dbms_crypto.hash(replace(x.item_data.getclobval(),'>CHAR<','>VARCHAR2<'),]'||a_hash_type||') ' ||
+      '  from ( select '||get_columns_filter(a_exclude_xpath, a_include_xpath)||
+      '           from (select :columns_info as item_data from dual ) ucd' ||
+      '  ) x'
+      into l_cols_hash using a_exclude_xpath, a_include_xpath, a_data_value_cursor.columns_info;
+    end if;
+    return l_cols_hash;
+  end;
+
 begin
   g_type_name_map( dbms_sql.binary_bouble_type )           := 'BINARY_DOUBLE';
   g_type_name_map( dbms_sql.bfile_type )                   := 'BFILE';
diff --git a/source/expectations/data_values/ut_compound_data_helper.pks b/source/expectations/data_values/ut_compound_data_helper.pks
@@ -52,5 +52,14 @@ create or replace package ut_compound_data_helper authid definer is
     a_max_rows integer, a_exclude_xpath varchar2, a_include_xpath varchar2
   ) return tt_row_diffs;
 
+  subtype t_hash  is raw(128);
+
+  function get_hash(a_data raw, a_hash_type binary_integer := dbms_crypto.hash_sh1)  return t_hash;
+  function get_hash(a_data clob, a_hash_type binary_integer := dbms_crypto.hash_sh1) return t_hash;
+  function columns_hash(
+    a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2,
+    a_hash_type binary_integer := dbms_crypto.hash_sh1
+  ) return t_hash;
+
 end;
 /
diff --git a/source/expectations/data_values/ut_compound_data_tmp.sql b/source/expectations/data_values/ut_compound_data_tmp.sql
@@ -12,7 +12,7 @@ create global temporary table ut_compound_data_tmp(
   See the License for the specific language governing permissions and
   limitations under the License.
   */
-  data_id raw(16),
+  data_id          raw(32),
   item_no          integer,
   item_data        xmltype,
   constraint ut_compound_data_tmp_pk primary key(data_id, item_no)
diff --git a/source/expectations/data_values/ut_compound_data_value.tpb b/source/expectations/data_values/ut_compound_data_value.tpb
@@ -89,7 +89,7 @@ create or replace type body ut_compound_data_value as
     l_ut_owner          varchar2(250) := ut_utils.ut_owner;
     l_diff_row_count    integer;
     l_actual            ut_compound_data_value;
-    l_diff_id           raw(16);
+    l_diff_id           ut_compound_data_helper.t_hash;
     l_row_diffs         ut_compound_data_helper.tt_row_diffs;
   begin
     if not a_other is of (ut_compound_data_value) then
@@ -100,7 +100,7 @@ create or replace type body ut_compound_data_value as
     dbms_lob.createtemporary(l_result,true);
 
     --diff rows and row elements
-    l_diff_id := dbms_crypto.hash(self.data_id||l_actual.data_id,2);
+    l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_actual.data_id);
     -- First tell how many rows are different
     execute immediate 'select count(*) from ' || l_ut_owner || '.ut_compound_data_diff_tmp where diff_id = :diff_id' into l_diff_row_count using l_diff_id;
 
@@ -128,7 +128,7 @@ create or replace type body ut_compound_data_value as
     l_other           ut_compound_data_value;
     l_ut_owner        varchar2(250) := ut_utils.ut_owner;
     l_column_filter   varchar2(32767);
-    l_diff_id         raw(16);
+    l_diff_id         ut_compound_data_helper.t_hash;
     l_result          integer;
     --the XML stylesheet is applied on XML representation of data to exclude column names from comparison
     --column names and data-types are compared separately
@@ -152,7 +152,7 @@ create or replace type body ut_compound_data_value as
 
     l_other   := treat(a_other as ut_compound_data_value);
 
-    l_diff_id := dbms_crypto.hash(self.data_id||l_other.data_id,2);
+    l_diff_id := ut_compound_data_helper.get_hash(self.data_id||l_other.data_id);
     l_column_filter := ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath);
     -- Find differences
     execute immediate 'insert into ' || l_ut_owner || '.ut_compound_data_diff_tmp ( diff_id, item_no )
diff --git a/source/expectations/data_values/ut_data_value_refcursor.tpb b/source/expectations/data_values/ut_data_value_refcursor.tpb
@@ -186,21 +186,6 @@ create or replace type body ut_data_value_refcursor as
   overriding member function compare_implementation(a_other ut_data_value, a_exclude_xpath varchar2, a_include_xpath varchar2) return integer is
     l_result          integer := 0;
     l_other           ut_data_value_refcursor;
-    function columns_hash(
-      a_data_value_cursor ut_data_value_refcursor, a_exclude_xpath varchar2, a_include_xpath varchar2
-    ) return raw is
-      l_cols_hash  raw(32);
-    begin
-      if not a_data_value_cursor.is_null then
-        execute immediate
-        q'[select dbms_crypto.hash(replace(x.item_data.getclobval(),'>CHAR<','>VARCHAR2<'),3) ]' ||
-        '  from ( select '||ut_compound_data_helper.get_columns_filter(a_exclude_xpath, a_include_xpath)||
-        '           from (select :columns_info as item_data from dual ) ucd' ||
-        '  ) x'
-        into l_cols_hash using a_exclude_xpath, a_include_xpath, a_data_value_cursor.columns_info;
-      end if;
-      return l_cols_hash;
-    end;
   begin
     if not a_other is of (ut_data_value_refcursor) then
       raise value_error;
@@ -209,7 +194,9 @@ create or replace type body ut_data_value_refcursor as
     l_other   := treat(a_other as ut_data_value_refcursor);
 
     --if column names/types are not equal - build a diff of column names and types
-    if columns_hash( self, a_exclude_xpath, a_include_xpath ) != columns_hash( l_other, a_exclude_xpath, a_include_xpath ) then
+    if ut_compound_data_helper.columns_hash( self, a_exclude_xpath, a_include_xpath )
+       != ut_compound_data_helper.columns_hash( l_other, a_exclude_xpath, a_include_xpath )
+    then
       l_result := 1;
     end if;
     l_result := l_result + (self as ut_compound_data_value).compare_implementation(a_other, a_exclude_xpath, a_include_xpath);
diff --git a/source/install.sql b/source/install.sql
@@ -141,10 +141,9 @@ prompt Installing PLSQL profiler objects into &&ut3_owner schema
 --expectations and matchers
 @@install_component.sql 'expectations/data_values/ut_compound_data_tmp.sql'
 @@install_component.sql 'expectations/data_values/ut_compound_data_diff_tmp.sql'
-@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
-@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb'
 @@install_component.sql 'expectations/data_values/ut_data_value.tps'
 @@install_component.sql 'expectations/data_values/ut_compound_data_value.tps'
+@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pks'
 @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_collection.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value_object.tps'
@@ -180,6 +179,7 @@ prompt Installing PLSQL profiler objects into &&ut3_owner schema
 @@install_component.sql 'expectations/ut_expectation_compound.tps'
 @@install_component.sql 'expectations/data_values/ut_data_value.tpb'
 @@install_component.sql 'expectations/data_values/ut_compound_data_value.tpb'
+@@install_component.sql 'expectations/data_values/ut_compound_data_helper.pkb'
 @@install_component.sql 'expectations/data_values/ut_data_value_anydata.tpb'
 @@install_component.sql 'expectations/data_values/ut_data_value_object.tpb'
 @@install_component.sql 'expectations/data_values/ut_data_value_collection.tpb'
