Combine Signature Steps

StepCheckSignature and StepSaveSignature are combined

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/203140/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/203141/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/203513/

Change-Id: I5385c1503e3d55eb291f0c7d6455c21a07fe4301
Signed-off-by: ilho <ilho159.kim@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index d87ba82..424b3cb 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -70,7 +70,6 @@
 #include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
-#include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_get_privilege_level.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -80,7 +79,7 @@
 #include <common/step/security/step_revoke_security.h>
 #include <common/step/security/step_revoke_trust_anchor.h>
 #include <common/step/security/step_rollback_installation_security.h>
-#include <common/step/security/step_save_signature.h>
+#include <common/step/security/step_signature.h>
 #include <common/step/security/step_update_security.h>
 #include <common/step/security/step_register_trust_anchor.h>
 #include <common/step/security/step_unregister_trust_anchor.h>
@@ -137,8 +136,7 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -193,8 +191,7 @@ void HybridInstaller::UpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -296,8 +293,7 @@ void HybridInstaller::DeltaSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -378,8 +374,7 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -434,8 +429,7 @@ void HybridInstaller::MountUpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -493,8 +487,7 @@ void HybridInstaller::ManifestDirectInstallSteps() {
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -535,8 +528,7 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -579,8 +571,7 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::pkgmgr::StepRegisterApplication>();
   AddStep<ci::security::StepRegisterTrustAnchor>(
@@ -607,8 +598,7 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<hybrid::configuration::StepMergeTpkConfig>(
       hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::BACKUP);
@@ -661,8 +651,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
       wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<hybrid::configuration::StepMergeTpkPrivileges>();
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
@@ -721,7 +710,7 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
-  AddStep<ci::security::StepCheckSignature>();
+  AddStep<ci::security::StepSignature>(false);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();

diff --git a/src/wgt/step/security/step_direct_manifest_check_signature.h b/src/wgt/step/security/step_direct_manifest_check_signature.h
deleted file mode 100644 (file)
index a56a998..0000000
--- a/src/wgt/step/security/step_direct_manifest_check_signature.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
-// Use of this source code is governed by an apache-2.0 license that can be
-// found in the LICENSE file.
-
-#ifndef WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_
-#define WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_
-
-#include <common/step/security/step_check_signature.h>
-#include <manifest_parser/utils/logging.h>
-
-namespace wgt {
-namespace security {
-
-class StepDirectManifestCheckSignature
-    : public common_installer::security::StepCheckSignature {
- public:
-  using StepCheckSignature::StepCheckSignature;
-
- private:
-  boost::filesystem::path GetSignatureRoot() const override;
-
-  STEP_NAME(StepDirectManifestCheckSignature)
-};
-
-}  // namespace security
-}  // namespace wgt
-
-#endif  // WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_CHECK_SIGNATURE_H_

diff --git a/src/wgt/step/security/step_direct_manifest_check_signature.cc b/src/wgt/step/security/step_direct_manifest_signature.cc
similarity index 53%
rename from src/wgt/step/security/step_direct_manifest_check_signature.cc
rename to src/wgt/step/security/step_direct_manifest_signature.cc
index 469a490..8d3e646 100644 (file)
--- a/src/wgt/step/security/step_direct_manifest_check_signature.cc
+++ b/src/wgt/step/security/step_direct_manifest_signature.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#include "wgt/step/security/step_direct_manifest_check_signature.h"
+#include "wgt/step/security/step_direct_manifest_signature.h"
 
 namespace bf = boost::filesystem;
 
@@ -15,8 +15,8 @@ const char kResWgt[] = "res/wgt";
 namespace wgt {
 namespace security {
 
-bf::path StepDirectManifestCheckSignature::GetSignatureRoot() const {
-  return StepCheckSignature::GetSignatureRoot() / kResWgt;
+bf::path StepDirectManifestSignature::GetSignatureRoot() const {
+  return StepSignature::GetSignatureRoot() / kResWgt;
 }
 
 }  // namespace security

diff --git a/src/wgt/step/security/step_direct_manifest_signature.h b/src/wgt/step/security/step_direct_manifest_signature.h
new file mode 100644 (file)
index 0000000..d7910f2
--- /dev/null
+++ b/src/wgt/step/security/step_direct_manifest_signature.h
@@ -0,0 +1,34 @@
+// Copyright (c) 2019 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_
+#define WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_
+
+#include <common/step/security/step_signature.h>
+#include <manifest_parser/utils/logging.h>
+
+namespace ci = common_installer;
+
+namespace wgt {
+namespace security {
+
+class StepDirectManifestSignature
+    : public ci::security::StepSignature {
+ public:
+  using StepSignature::StepSignature;
+
+  StepDirectManifestSignature(ci::InstallerContext* context,
+        bool save_signature) :
+                ci::security::StepSignature(context, save_signature) {}
+
+ private:
+  boost::filesystem::path GetSignatureRoot() const override;
+
+  STEP_NAME(StepDirectManifestSignature)
+};
+
+}  // namespace security
+}  // namespace wgt
+
+#endif  // WGT_STEP_SECURITY_STEP_DIRECT_MANIFEST_SIGNATURE_H_

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 285bf57..885353a 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -80,7 +80,6 @@
 #include <common/step/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_check_old_certificate.h>
-#include <common/step/security/step_check_signature.h>
 #include <common/step/security/step_get_privilege_level.h>
 #include <common/step/security/step_privacy_privilege.h>
 #include <common/step/security/step_privilege_compatibility.h>
@@ -93,7 +92,7 @@
 #include <common/step/security/step_update_security.h>
 #include <common/step/security/step_register_trust_anchor.h>
 #include <common/step/security/step_revoke_trust_anchor.h>
-#include <common/step/security/step_save_signature.h>
+#include <common/step/security/step_signature.h>
 #include <common/step/security/step_unregister_trust_anchor.h>
 
 #include <wgt_manifest_handlers/widget_config_parser.h>
@@ -119,7 +118,7 @@
 #include "wgt/step/security/step_check_wgt_background_category.h"
 #include "wgt/step/security/step_check_wgt_notification_category.h"
 #include "wgt/step/security/step_check_wgt_ime_privilege.h"
-#include "wgt/step/security/step_direct_manifest_check_signature.h"
+#include "wgt/step/security/step_direct_manifest_signature.h"
 #include "wgt/step/security/step_check_extension_privileges.h"
 #include "wgt/step/security/step_wgt_recover_signature.h"
 
@@ -143,8 +142,7 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -191,8 +189,7 @@ void WgtInstaller::UpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -315,8 +312,7 @@ void WgtInstaller::DeltaSteps() {
   AddStep<ci::filesystem::StepDeltaPatch>("res/wgt/");
   AddStep<ci::filesystem::StepDisableExternalMount>();
   AddStep<wgt::configuration::StepCheckStartFiles>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -394,8 +390,7 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::pkgmgr::StepCheckRestriction>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -441,8 +436,7 @@ void WgtInstaller::MountUpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -492,8 +486,7 @@ void WgtInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::mount::StepCheckMountPath>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<wgt::security::StepDirectManifestCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<wgt::security::StepDirectManifestSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtNotificationCategory>();
@@ -526,8 +519,7 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<wgt::security::StepDirectManifestCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<wgt::security::StepDirectManifestSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtNotificationCategory>();
@@ -565,8 +557,7 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<ci::configuration::StepCheckTizenVersion>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckSettingsLevel>();
@@ -619,8 +610,7 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::pkgmgr::StepCheckUpgradable>();
   AddStep<ci::configuration::StepParsePreload>();
   AddStep<wgt::configuration::StepSetOldSignatureFilesLocation>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<ci::configuration::StepSwitchReadonlyMode>();
@@ -648,8 +638,7 @@ void WgtInstaller::ManifestPartialInstallSteps() {
   AddStep<wgt::configuration::StepParse>(
       wgt::configuration::StepParse::ConfigLocation::INSTALLED, true);
   AddStep<ci::configuration::StepParsePreload>();
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtBackgroundCategory>();
@@ -675,8 +664,7 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::BACKUP);
-  AddStep<ci::security::StepCheckSignature>();
-  AddStep<ci::security::StepSaveSignature>();
+  AddStep<ci::security::StepSignature>(true);
   AddStep<ci::security::StepPrivilegeCompatibility>(
       ci::security::StepPrivilegeCompatibility::InternalPrivType::WGT);
   AddStep<wgt::security::StepCheckWgtBackgroundCategory>();