From c018d6f4ca27882927dc3b5d70cb654bf2049ea1 Mon Sep 17 00:00:00 2001 From: Kichan Kwon Date: Mon, 21 Dec 2020 17:38:16 +0900 Subject: [PATCH] No more check hash value of RW script - Hash checking is for MCD FOTA - To prevent modification without notice - MCD no more uses ours, so we don't have to retain it which bothers script developer Change-Id: Ib473ce99adfe592a574fc01975e61fdff2479fce Signed-off-by: Kichan Kwon --- packaging/system-rw-update.spec | 3 --- rw-script-list/add_rwscript.sh | 31 ------------------------------ rw-script-list/del_rwscript.sh | 22 --------------------- rw-script-list/extract_list.sh | 23 ---------------------- rw-script-list/image_info.txt | 2 -- rw-script-list/rw-script.list | 16 ---------------- upgrade/update.sh.in | 42 ----------------------------------------- 7 files changed, 139 deletions(-) delete mode 100755 rw-script-list/add_rwscript.sh delete mode 100755 rw-script-list/del_rwscript.sh delete mode 100755 rw-script-list/extract_list.sh delete mode 100644 rw-script-list/image_info.txt delete mode 100755 rw-script-list/rw-script.list diff --git a/packaging/system-rw-update.spec b/packaging/system-rw-update.spec index 4bacce7..ffe2c4e 100644 --- a/packaging/system-rw-update.spec +++ b/packaging/system-rw-update.spec @@ -53,9 +53,6 @@ ln -s ../dbus.socket %{buildroot}%{_unitdir}/system-update.target.wants install -m 644 units/udev-sdb-init.service %{buildroot}%{_unitdir} ln -s ../udev-sdb-init.service %{buildroot}%{_unitdir}/system-update.target.wants -# rw-script-list -cp -f rw-script-list/rw-script.list %{buildroot}%{_datadir}/upgrade - %clean rm -rf %{buildroot} diff --git a/rw-script-list/add_rwscript.sh b/rw-script-list/add_rwscript.sh deleted file mode 100755 index 326079b..0000000 --- a/rw-script-list/add_rwscript.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -if [ "$#" != "1" ]; then - echo "Usage:" - echo "add_rwscript.sh " - echo " ex) add_rwscript.sh /home/work3/rw-updater/model/common/scripts/100.rw-updater.recovery.patch.sh" - exit; -fi - -FULLPATH=$1 -SC_NAME=`basename "${FULLPATH}"` - -grep ${SC_NAME} rw-script.list > /dev/null 2>&1 -if [ $? -eq 0 ]; then - cp rw-script.list rw-script.bak - grep -v ${SC_NAME} rw-script.bak > rw-script.list - rm -f rw-script.bak -fi - -POST=`date +"%d%H%M%S"` - -ret=`md5sum ${FULLPATH}` -mret=($(/bin/echo $ret)) -md5result=${mret[0]} - -cp rw-script.list rw-script.bak -echo "${SC_NAME} ${md5result}" >> rw-script.bak -sort -d rw-script.bak > rw-script.list - -rm -f rw-script.bak -echo "Add DONE: ${SC_NAME} ${md5sum}" diff --git a/rw-script-list/del_rwscript.sh b/rw-script-list/del_rwscript.sh deleted file mode 100755 index cc2346a..0000000 --- a/rw-script-list/del_rwscript.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash - -if [ "$#" != "1" ]; then - echo "Usage:" - echo "del_rwscript.sh " - echo " ex) del_rwscript.sh 220.evas.patch.sh" - exit; -fi - -SC_NAME="$1" - -grep ${SC_NAME} rw-script.list > /dev/null 2>&1 -if [ $? -ne 0 ]; then - echo "No entry ${SC_NAME} in rw-script list" - exit -fi - -cp rw-script.list rw-script.bak -grep -v ${SC_NAME} rw-script.bak > rw-script.list - -rm -f rw-script.bak -echo "Remove DONE: ${SC_NAME} ${GIT_NAME}" diff --git a/rw-script-list/extract_list.sh b/rw-script-list/extract_list.sh deleted file mode 100755 index 50a0db3..0000000 --- a/rw-script-list/extract_list.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# extract_list.sh -# Extract RW script list from target device -# - -TEMP_DIR=extract_scripts -SCRIPTS_PATH=/usr/share/upgrade/scripts -MODEL_CONFIG=/etc/config/model-config.xml - -if [ -e ${TEMP_DIR} ]; then - rm -rf ${TEMP_DIR} -fi -mkdir ${TEMP_DIR} - -sdb root on -sdb pull ${SCRIPTS_PATH} ${TEMP_DIR} - -for SCRIPT in ${TEMP_DIR}/*; do - ./add_rwscript.sh ${SCRIPT} -done - -rm -rf ${TEMP_DIR} diff --git a/rw-script-list/image_info.txt b/rw-script-list/image_info.txt deleted file mode 100644 index 2aa1b26..0000000 --- a/rw-script-list/image_info.txt +++ /dev/null @@ -1,2 +0,0 @@ -Base image of RW script list: -tizen-4.0-unified_20171215.1_wearable-wayland-armv7l-tw1 diff --git a/rw-script-list/rw-script.list b/rw-script-list/rw-script.list deleted file mode 100755 index 6de84fe..0000000 --- a/rw-script-list/rw-script.list +++ /dev/null @@ -1,16 +0,0 @@ -201.security_upgrade.sh 869f8e1ba11ee37a17abe1d519a95bc8 -290.buxton2_upgrade.sh ff3ec647dd4c0360b56b3757ae43829a -295.key-manager_upgrade.sh 646b5031c415222c71b4b767c817e7d0 -500.account-manager.sh 43f8ff185180167241e1cd091f66dc06 -500.connman_upgrade.sh 14efbfe125f33d44b22ade08ea64968c -500.crash-manager-upgrade.sh 28c936a201035b086c37dd0438468726 -500.edge-orchestration-upgrade.sh 3284627d8fcfda64b5a50356740ecc4a -500.efl-misc.sh a74f47437c226f3723c02e5759de2ea0 -500.ode_upgrade.sh 1d9b1b99222f780d3b450194fcb75ea9 -500.stc-manager_upgrade.sh d8d98fd0881ec7e3db0a521389c99a6e -500.winsys_upgrade.sh 29ac61e4ac32a27705580614646bf7f0 -501.component_upgrade.sh aa728b7c613daa45e187f7663dc184e8 -502.syspopup_upgrade.sh 369ec9ab48fae5598e24091d76df4175 -504.watchface_complication_upgrade.sh bb3dfebd83cf95cda1a73738b27538a5 -505.notification_upgrade.sh 11dab5281d1a5965ff6a22d8aa37ba4c -700.pkgmgr.patch.sh f2a3ad5d4c7e25b152b2d50d4d7d9117 diff --git a/upgrade/update.sh.in b/upgrade/update.sh.in index 7cce7b2..5620347 100755 --- a/upgrade/update.sh.in +++ b/upgrade/update.sh.in @@ -46,46 +46,6 @@ NOTIFY() } #------------------------------------------------ -# shell script verity check -# return 0 : pass -# return 1 : no entry in rw-script.list -# return 2 : verity fail -#------------------------------------------------ -Verity_Check() { - - if [ "z$1" = "z" ]; then - DEBUG "Verity_Check: Input is Null" - return 1 - fi - - SC_FILE=`/usr/bin/basename $1` - SC_LIST=${UPDATE_DIR}/rw-script.list - if [ -f ${SC_LIST} ]; then - grep ${SC_FILE} ${SC_LIST} > /dev/null 2>&1 - if [ "$?" = "0" ]; then - ret=`/usr/bin/md5sum "$1"` - mret=($(/bin/echo $ret)) - md5result=${mret[0]} - - md5list=`/usr/bin/grep ${SC_FILE} ${SC_LIST} | /usr/bin/awk -F' ' '{print $2}'` - if [ "$md5result" = "$md5list" ]; then - DEBUG "Verity_Check: [PASS] ${SC_FILE} verity check" - return 0 - else - ERROR "Verity_Check: [MISMATCH] ${SC_FILE} md5sum" - return 2 - fi - else - ERROR "Verity_Check: [NO ENTRY] ${SC_FILE} in ${SC_LIST}" - return 1 - fi - else - ERROR "Verity_Check: No script list file ${SC_LIST}" - return 1 - fi -} - -#------------------------------------------------ # main #------------------------------------------------ @@ -121,8 +81,6 @@ else progress=$((progress+1)) echo ${progress} > ${TMP_DIR}/progress fi - Verity_Check ${UPDATE_SCRIPT_DIR}/${UPSCRIPT} - # Without verification result, run all scripts ${SHELL} ${UPDATE_SCRIPT_DIR}/${UPSCRIPT} if [ $? -ne 0 ]; then ERROR "[FAIL] ${UPSCRIPT}" -- 2.7.4