Remove all of hard coded paths

Change-Id: Ib829bab36e177d36c6093707e5212acc0a82bcf7
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 953dc78..fe534f4 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,10 +57,13 @@ ADD_DEFINITIONS("-DSERVICE_NAME=\"${SERVICE_NAME}\"")
 ADD_DEFINITIONS("-DUSER_NAME=\"${USER_NAME}\"")
 ADD_DEFINITIONS("-DGROUP_NAME=\"${GROUP_NAME}\"")
 ADD_DEFINITIONS("-DSMACK_DOMAIN_NAME=\"${SMACK_DOMAIN_NAME}\"")
+ADD_DEFINITIONS("-DOLD_RW_DATA_DIR=\"${OLD_RW_DATA_DIR}\"")
 ADD_DEFINITIONS("-DRW_DATA_DIR=\"${RW_DATA_DIR}\"")
 ADD_DEFINITIONS("-DRO_DATA_DIR=\"${RO_DATA_DIR}\"")
 ADD_DEFINITIONS("-DETC_DIR=\"${ETC_DIR}\"")
+ADD_DEFINITIONS("-DBIN_DIR=\"${BIN_DIR}\"")
 ADD_DEFINITIONS("-DINITIAL_VALUES_DIR=\"${INITIAL_VALUES_DIR}\"")
+ADD_DEFINITIONS("-DCA_CERTS_DIR=\"${CA_CERTS_DIR}\"")
 ADD_DEFINITIONS("-DSYSTEMD_ENV_FILE=\"${SYSTEMD_ENV_FILE}\"")
 
 IF (CMAKE_BUILD_TYPE MATCHES "DEBUG")
@@ -76,10 +79,11 @@ SET(TARGET_PAM_KEY_MANAGER_PLUGIN "pam_key_manager_plugin")
 
 SET(TARGET_TEST_MERGED "ckm-tests-internal")
 
-STRING(REGEX REPLACE "/$" "" RW_DATA_DIR_WITHOUT_END_SLASH "${RW_DATA_DIR}")
 CONFIGURE_FILE(packaging/key-manager.manifest.in key-manager.manifest @ONLY)
+CONFIGURE_FILE(packaging/key-manager-tests.manifest.in key-manager-tests.manifest @ONLY)
 
-ADD_SUBDIRECTORY(data/scripts)
+ADD_SUBDIRECTORY(data)
+ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(build)
 ADD_SUBDIRECTORY(systemd)

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
new file mode 100644 (file)
index 0000000..d6d9f4a
--- /dev/null
+++ b/data/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        CMakeLists.txt
+# @author      Kyungwook Tak (k.tak@samsung.com)
+# @brief
+#
+ADD_SUBDIRECTORY(gumd)
+ADD_SUBDIRECTORY(scripts)
+
+INSTALL(DIRECTORY DESTINATION ${INITIAL_VALUES_DIR})

diff --git a/data/gumd/10_key-manager.post b/data/gumd/10_key-manager.post.in
similarity index 83%
rename from data/gumd/10_key-manager.post
rename to data/gumd/10_key-manager.post.in
index 85f82c7..433cd45 100755 (executable)
--- a/data/gumd/10_key-manager.post
+++ b/data/gumd/10_key-manager.post.in
@@ -4,4 +4,4 @@
 # $2 - uid
 # $3 - gid
 # call key-manager tool for locking the database and removing user entries
-ckm_tool -d $2
+@BIN_DIR@/ckm_tool -d $2

diff --git a/data/gumd/CMakeLists.txt b/data/gumd/CMakeLists.txt
new file mode 100644 (file)
index 0000000..f9f4d9c
--- /dev/null
+++ b/data/gumd/CMakeLists.txt
@@ -0,0 +1,25 @@
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        CMakeLists.txt
+# @author      Kyungwook Tak (k.tak@samsung.com)
+# @brief
+#
+CONFIGURE_FILE(10_key-manager.post.in 10_key-manager.post @ONLY)
+
+INSTALL(FILES 10_key-manager.post DESTINATION ${RO_ETC_DIR}/gumd/userdel.d
+    PERMISSIONS
+        OWNER_READ
+        OWNER_WRITE
+        OWNER_EXECUTE)

diff --git a/data/scripts/230.key-manager-change-data-dir.patch.sh.in b/data/scripts/230.key-manager-change-data-dir.patch.sh.in
index a2b367e..c5670b6 100755 (executable)
--- a/data/scripts/230.key-manager-change-data-dir.patch.sh.in
+++ b/data/scripts/230.key-manager-change-data-dir.patch.sh.in
@@ -19,10 +19,8 @@
 # @brief       Moves key-manager data to a location specified at compilation time
 #
 
-CKM_DATA_PATH_OLD=/opt/data/ckm/
-
 # move data from old path to new one
-if [ -d "$CKM_DATA_PATH_OLD" ] && [ "@RW_DATA_DIR@" != "$CKM_DATA_PATH_OLD" ]
+if [ -d "@OLD_RW_DATA_DIR@" ] && [ "@RW_DATA_DIR@" != "@OLD_RW_DATA_DIR@" ]
 then
-    cp -a $CKM_DATA_PATH_OLD/. @RW_DATA_DIR@ && rm -rf $CKM_DATA_PATH_OLD
+    cp -a @OLD_RW_DATA_DIR@/. @RW_DATA_DIR@ && rm -rf @OLD_RW_DATA_DIR@
 fi

diff --git a/data/scripts/232.key-manager-change-user.patch.sh.in b/data/scripts/232.key-manager-change-user.patch.sh.in
index b6b2ae6..ee04adf 100755 (executable)
--- a/data/scripts/232.key-manager-change-user.patch.sh.in
+++ b/data/scripts/232.key-manager-change-user.patch.sh.in
@@ -19,22 +19,16 @@
 # @author      Krzysztof Jackiewicz (k.jackiewicz@samsung.com)
 # @brief       Changes ckm data owner to key-manager:key-manager and smack label to "System"
 #
-
-USER_NAME=key-manager
-GROUP_NAME=key-manager
-SMACK_LABEL=System
-
-id -g $GROUP_NAME > /dev/null 2>&1
+id -g @GROUP_NAME@ > /dev/null 2>&1
 if [ $? -eq 1 ]; then
-    groupadd $GROUP_NAME -r > /dev/null 2>&1
+    groupadd @GROUP_NAME@ -r > /dev/null 2>&1
 fi
 
-id -u $USER_NAME > /dev/null 2>&1
+id -u @USER_NAME@ > /dev/null 2>&1
 if [ $? -eq 1 ]; then
-    useradd -d /var/lib/empty -s /sbin/nologin -r -g $GROUP_NAME $USER_NAME > /dev/null 2>&1
+    useradd -d /var/lib/empty -s @SBIN_DIR@/nologin -r -g @GROUP_NAME@ @USER_NAME@ > /dev/null 2>&1
 fi
 
 # In ckm version <= 0.1.18 all files were owned by root.
-find @RW_DATA_DIR@ -exec chsmack -a $SMACK_LABEL {} \;
-chown ${USER_NAME}:${GROUP_NAME} -R @RW_DATA_DIR@
-
+find @RW_DATA_DIR@ -exec chsmack -a @SMACK_DOMAIN_NAME@ {} \;
+chown @USER_NAME@:@GROUP_NAME@ -R @RW_DATA_DIR@

diff --git a/data/scripts/CMakeLists.txt b/data/scripts/CMakeLists.txt
index 20d47c6..f709fa0 100644 (file)
--- a/data/scripts/CMakeLists.txt
+++ b/data/scripts/CMakeLists.txt
@@ -30,10 +30,19 @@ CONFIGURE_FILE(232.key-manager-change-user.patch.sh.in
                @ONLY)
 
 INSTALL(FILES
-        ${CMAKE_CURRENT_BINARY_DIR}/230.key-manager-change-data-dir.patch.sh
-        ${CMAKE_CURRENT_BINARY_DIR}/231.key-manager-migrate-dkek.patch.sh
-        ${CMAKE_CURRENT_BINARY_DIR}/232.key-manager-change-user.patch.sh
-        DESTINATION ${ETC_DIR}/opt/upgrade
-        PERMISSIONS OWNER_READ
-                    OWNER_WRITE
-                    OWNER_EXECUTE)
+        230.key-manager-change-data-dir.patch.sh
+        231.key-manager-migrate-dkek.patch.sh
+        232.key-manager-change-user.patch.sh
+    DESTINATION ${RO_ETC_DIR}/opt/upgrade
+    PERMISSIONS
+        OWNER_READ
+        OWNER_WRITE
+        OWNER_EXECUTE)
+
+INSTALL(FILES
+        create_schema.sql
+        drop_all.sql
+        migrate_1.sql
+        migrate_2.sql
+        migrate_3.sql
+    DESTINATION ${RO_DATA_DIR}/scripts)

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9488498
--- /dev/null
+++ b/doc/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+# @file        CMakeLists.txt
+# @author      Kyungwook Tak (k.tak@samsung.com)
+# @brief
+#
+INSTALL(FILES initial_values.xsd sw_key.xsd DESTINATION ${RO_DATA_DIR})

diff --git a/packaging/key-manager-tests.manifest b/packaging/key-manager-tests.manifest
deleted file mode 100644 (file)
index 8471cc3..0000000
--- a/packaging/key-manager-tests.manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-<manifest>
-       <request>
-               <domain name="_" />
-       </request>
-       <assign>
-               <filesystem path="/usr/bin/ckm-tests-internal" exec_label="System" />
-               <filesystem path="/usr/bin/ckm_db_tool" exec_label="System" />
-               <filesystem path="/usr/bin/ckm_generate_db" exec_label="System" />
-       </assign>
-</manifest>

diff --git a/packaging/key-manager-tests.manifest.in b/packaging/key-manager-tests.manifest.in
new file mode 100644 (file)
index 0000000..2442a89
--- /dev/null
+++ b/packaging/key-manager-tests.manifest.in
@@ -0,0 +1,10 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+       <assign>
+               <filesystem path="@BIN_DIR@/ckm-tests-internal" exec_label="@SMACK_DOMAIN_NAME@" />
+               <filesystem path="@BIN_DIR@/ckm_db_tool" exec_label="@SMACK_DOMAIN_NAME@" />
+               <filesystem path="@BIN_DIR@/ckm_generate_db" exec_label="@SMACK_DOMAIN_NAME@" />
+       </assign>
+</manifest>

diff --git a/packaging/key-manager.manifest.in b/packaging/key-manager.manifest.in
index 8d2a2a6..e3453e0 100644 (file)
--- a/packaging/key-manager.manifest.in
+++ b/packaging/key-manager.manifest.in
@@ -3,6 +3,6 @@
                <domain name="_" />
        </request>
        <assign>
-               <filesystem path="@RW_DATA_DIR_WITHOUT_END_SLASH@" label="System" type="transmutable" />
+               <filesystem path="@RW_DATA_DIR@" label="@SMACK_DOMAIN_NAME@" type="transmutable" />
        </assign>
 </manifest>

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index c9f3cae..bb3998c 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -9,7 +9,6 @@ Source1001: key-manager-pam-plugin.manifest
 Source1002: libkey-manager-client.manifest
 Source1003: libkey-manager-client-devel.manifest
 Source1004: libkey-manager-common.manifest
-Source1005: key-manager-tests.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
@@ -27,6 +26,7 @@ BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(pkgmgr)
 BuildRequires: boost-devel
+BuildRequires: ca-certificates-devel
 #Requires(pre): tizen-platform-config-tools
 Requires: libkey-manager-common = %{version}-%{release}
 %{?systemd_requires}
@@ -35,12 +35,16 @@ Requires: libkey-manager-common = %{version}-%{release}
 %global group_name key-manager
 %global service_name key-manager
 %global smack_domain_name System
-%global rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
-%global ro_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/ckm/}%{!?TZ_SYS_RO_SHARE:/usr/share/ckm/}
-%global db_test_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/ckm-db-test/}%{!?TZ_SYS_RO_SHARE:/usr/share/ckm-db-test/}
-%global etc_dir %{?TZ_SYS_RO_ETC:%TZ_SYS_RO_ETC/}%{!?TZ_SYS_RO_ETC:/etc/}
-%global run_dir %{?TZ_SYS_RUN:%TZ_SYS_RUN/}%{!?TZ_SYS_RUN:/var/run/}
-%global initial_values_dir %{rw_data_dir}initial_values/
+%global old_rw_data_dir /opt/data/ckm
+%global rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm}%{!?TZ_SYS_DATA:%old_rw_data_dir}
+%global ro_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/ckm}%{!?TZ_SYS_RO_SHARE:%_datadir/ckm}
+%global db_test_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/ckm-db-test}%{!?TZ_SYS_RO_SHARE:%_datadir/ckm-db-test}
+%global bin_dir %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
+%global sbin_dir %{?TZ_SYS_SBIN:%TZ_SYS_SBIN}%{!?TZ_SYS_SBIN:%_sbindir}
+%global ro_etc_dir %{?TZ_SYS_RO_ETC:%TZ_SYS_RO_ETC}%{!?TZ_SYS_RO_ETC:/etc}
+%global run_dir %{?TZ_SYS_RUN:%TZ_SYS_RUN}%{!?TZ_SYS_RUN:/var/run}
+%global initial_values_dir %{rw_data_dir}/initial_values
+%global ca_certs_dir %{?TZ_SYS_CA_CERTS:%TZ_SYS_CA_CERTS}%{!?TZ_SYS_CA_CERTS:%ro_etc_dir/ssl/certs}
 
 %description
 Central Key Manager daemon could be used as secure storage
@@ -50,8 +54,8 @@ application to sign and verify (DSA/RSA/ECDSA) signatures.
 %package -n libkey-manager-common
 Summary:    Central Key Manager (common libraries)
 Group:      Development/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n libkey-manager-common
 Central Key Manager package (common library)
@@ -61,8 +65,8 @@ Summary:    Central Key Manager (client)
 Group:      Development/Libraries
 Requires:   key-manager = %{version}-%{release}
 Requires:   libkey-manager-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n libkey-manager-client
 Central Key Manager package (client)
@@ -92,8 +96,8 @@ Summary:    CKM login/password module to PAM
 Group:      Development/Libraries
 BuildRequires: pam-devel
 Requires:   key-manager = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n key-manager-pam-plugin
 CKM login/password module to PAM. Used to monitor user login/logout
@@ -106,7 +110,6 @@ cp -a %{SOURCE1001} .
 cp -a %{SOURCE1002} .
 cp -a %{SOURCE1003} .
 cp -a %{SOURCE1004} .
-cp -a %{SOURCE1005} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -122,31 +125,26 @@ export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DSYSTEMD_UNIT_DIR=%{_unitdir} \
-        -DSYSTEMD_ENV_FILE=%{etc_dir}"/sysconfig/central-key-manager" \
+        -DSYSTEMD_ENV_FILE=%{ro_etc_dir}"/sysconfig/central-key-manager" \
         -DRUN_DIR:PATH=%{run_dir} \
         -DSERVICE_NAME=%{service_name} \
         -DUSER_NAME=%{user_name} \
         -DGROUP_NAME=%{group_name} \
         -DSMACK_DOMAIN_NAME=%{smack_domain_name} \
         -DMOCKUP_SM=%{?mockup_sm:%mockup_sm}%{!?mockup_sm:OFF} \
+        -DOLD_RW_DATA_DIR=%{old_rw_data_dir} \
         -DRW_DATA_DIR=%{rw_data_dir} \
         -DRO_DATA_DIR=%{ro_data_dir} \
-        -DETC_DIR=%{etc_dir} \
+        -DRW_ETC_DIR=%{rw_etc_dir} \
+        -DRO_ETC_DIR=%{ro_etc_dir} \
+        -DBIN_DIR=%{bin_dir} \
         -DINITIAL_VALUES_DIR=%{initial_values_dir} \
-        -DDB_TEST_DIR=%{db_test_dir}
+        -DDB_TEST_DIR=%{db_test_dir} \
+        -DCA_CERTS_DIR=%{ca_certs_dir}
 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{initial_values_dir}
-mkdir -p %{buildroot}%{ro_data_dir}/scripts
-mkdir -p %{buildroot}%{etc_dir}/gumd/userdel.d/
-cp data/scripts/*.sql %{buildroot}%{ro_data_dir}/scripts
-cp doc/initial_values.xsd %{buildroot}%{ro_data_dir}
-cp doc/sw_key.xsd %{buildroot}%{ro_data_dir}
-cp data/gumd/10_key-manager.post %{buildroot}%{etc_dir}/gumd/userdel.d/
-
 %make_install
 %install_service multi-user.target.wants central-key-manager.service
 %install_service sockets.target.wants central-key-manager-api-control.socket
@@ -179,15 +177,16 @@ cp data/gumd/10_key-manager.post %{buildroot}%{etc_dir}/gumd/userdel.d/
 #
 #id -u %{user_name} > /dev/null 2>&1
 #if [ $? -eq 1 ]; then
-#    useradd -d /var/lib/empty -s /sbin/nologin -r -g %{group_name} %{user_name} > /dev/null 2>&1
+#    useradd -d /var/lib/empty -s %{sbin_dir}/nologin -r -g %{group_name} %{user_name} > /dev/null 2>&1
 #fi
 
 %post
 # move data from old path to new one
 # we have to assume that in case of TZ_SYS_DATA change some upgrade script will move all the data
-if [ -d "/opt/data/ckm/" ] && [ "%{rw_data_dir}" != "/opt/data/ckm/" ]
+if [ -d "%{old_rw_data_dir}" ] && [ "%{rw_data_dir}" != "%{old_rw_data_dir}" ]
 then
-    cp -a /opt/data/ckm/. %{rw_data_dir} && rm -rf /opt/data/ckm/
+    echo "Migrating old rw data to new rw data dir"
+    cp -a %{old_rw_data_dir}/. %{rw_data_dir}/ && rm -rf %{old_rw_data_dir}
 fi
 
 systemctl daemon-reload
@@ -218,17 +217,17 @@ if [ $1 = 0 ]; then
     systemctl daemon-reload
 fi
 
-%post -n libkey-manager-common -p /sbin/ldconfig
-%post -n libkey-manager-client -p /sbin/ldconfig
-%postun -n libkey-manager-common -p /sbin/ldconfig
-%postun -n libkey-manager-client -p /sbin/ldconfig
+%post -n libkey-manager-common -p %{sbin_dir}/ldconfig
+%post -n libkey-manager-client -p %{sbin_dir}/ldconfig
+%postun -n libkey-manager-common -p %{sbin_dir}/ldconfig
+%postun -n libkey-manager-client -p %{sbin_dir}/ldconfig
 
 %files -n key-manager
 %manifest key-manager.manifest
 %license LICENSE
 %license LICENSE.BSL-1.0
 %license LICENSE.BSD-2.0
-%{_bindir}/key-manager
+%{bin_dir}/key-manager
 %{_unitdir}/multi-user.target.wants/central-key-manager.service
 %{_unitdir}/central-key-manager.service
 %{_unitdir}/central-key-manager.target
@@ -241,17 +240,14 @@ fi
 %{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket
 %{_unitdir}/central-key-manager-api-encryption.socket
 %dir %{ro_data_dir}
-%dir %{ro_data_dir}/scripts
-%{ro_data_dir}/initial_values.xsd
-%{ro_data_dir}/sw_key.xsd
-%{ro_data_dir}/scripts/*.sql
+%{ro_data_dir}/*
 %dir %attr(770, %{user_name}, %{group_name}) %{rw_data_dir}
 %dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir}
-%{etc_dir}/opt/upgrade/230.key-manager-change-data-dir.patch.sh
-%{etc_dir}/opt/upgrade/231.key-manager-migrate-dkek.patch.sh
-%{etc_dir}/opt/upgrade/232.key-manager-change-user.patch.sh
-%{etc_dir}/gumd/userdel.d/10_key-manager.post
-%{_bindir}/ckm_tool
+%{ro_etc_dir}/opt/upgrade/230.key-manager-change-data-dir.patch.sh
+%{ro_etc_dir}/opt/upgrade/231.key-manager-migrate-dkek.patch.sh
+%{ro_etc_dir}/opt/upgrade/232.key-manager-change-user.patch.sh
+%{ro_etc_dir}/gumd/userdel.d/10_key-manager.post
+%{bin_dir}/ckm_tool
 
 %files -n key-manager-pam-plugin
 %manifest key-manager-pam-plugin.manifest
@@ -290,8 +286,8 @@ fi
 
 %files -n key-manager-tests
 %manifest key-manager-tests.manifest
-%{_bindir}/ckm-tests-internal
-%{_bindir}/ckm_so_loader
-%{_bindir}/ckm_db_tool
-%{_bindir}/ckm_generate_db
+%{bin_dir}/ckm-tests-internal
+%{bin_dir}/ckm_so_loader
+%{bin_dir}/ckm_db_tool
+%{bin_dir}/ckm_generate_db
 %db_test_dir

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a4b83b6..9bcd3a4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -209,7 +209,7 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_CONTROL_CLIENT}
 INSTALL(TARGETS ${TARGET_KEY_MANAGER_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(TARGETS ${TARGET_KEY_MANAGER_CONTROL_CLIENT} DESTINATION ${LIB_INSTALL_DIR})
 
-INSTALL(TARGETS ${TARGET_KEY_MANAGER} DESTINATION bin)
+INSTALL(TARGETS ${TARGET_KEY_MANAGER} DESTINATION ${BIN_DIR})
 
 
 INSTALL(FILES

diff --git a/src/manager/crypto/sw-backend/store.cpp b/src/manager/crypto/sw-backend/store.cpp
index c287f0e..b3143eb 100644 (file)
--- a/src/manager/crypto/sw-backend/store.cpp
+++ b/src/manager/crypto/sw-backend/store.cpp
@@ -146,8 +146,8 @@ RawBuffer pack(const RawBuffer& data, const Password& pass)
 
 namespace
 {
-const char * const DEVICE_KEY_XSD = RO_DATA_DIR "sw_key.xsd";
-const char * const DEVICE_KEY_SW_FILE = RW_DATA_DIR "device_key.xml";
+const char * const DEVICE_KEY_XSD = RO_DATA_DIR "/sw_key.xsd";
+const char * const DEVICE_KEY_SW_FILE = RW_DATA_DIR "/device_key.xml";
 }
 
 Store::Store(CryptoBackend backendId)

diff --git a/src/manager/initial-values/initial-value-loader.cpp b/src/manager/initial-values/initial-value-loader.cpp
index fc7f156..1fd715d 100644 (file)
--- a/src/manager/initial-values/initial-value-loader.cpp
+++ b/src/manager/initial-values/initial-value-loader.cpp
@@ -27,7 +27,7 @@
 #include <InitialValuesFile.h>
 
 namespace {
-const char * const INIT_VALUES_XSD          = RO_DATA_DIR "initial_values.xsd";
+const char * const INIT_VALUES_XSD          = RO_DATA_DIR "/initial_values.xsd";
 const char * const INIT_VALUES_FILE_SUFFIX  = ".xml";
 } // namespace anonymous
 
@@ -51,7 +51,7 @@ void LoadFiles(CKMLogic &logic)
                 if (lowercaseFilename.find(INIT_VALUES_FILE_SUFFIX) == std::string::npos)
                     continue;
 
-                filesToParse.push_back(std::string(INITIAL_VALUES_DIR) + filename);
+                filesToParse.push_back(std::string(INITIAL_VALUES_DIR) + "/" + filename);
             }
             closedir(dp);
         }

diff --git a/src/manager/service/ckm-logic.cpp b/src/manager/service/ckm-logic.cpp
index e55bba8..de4d710 100644 (file)
--- a/src/manager/service/ckm-logic.cpp
+++ b/src/manager/service/ckm-logic.cpp
@@ -35,7 +35,7 @@
 #include <generic-backend/exception.h>
 
 namespace {
-const char * const CERT_SYSTEM_DIR          = "/etc/ssl/certs";
+const char * const CERT_SYSTEM_DIR          = CA_CERTS_DIR;
 const char * const SYSTEM_DB_PASSWD         = "cAtRugU7";
 
 bool isLabelValid(const CKM::Label &label)

diff --git a/src/manager/service/file-system.cpp b/src/manager/service/file-system.cpp
index 9fd68c4..9adbb22 100644 (file)
--- a/src/manager/service/file-system.cpp
+++ b/src/manager/service/file-system.cpp
@@ -60,28 +60,28 @@ FileSystem::FileSystem(uid_t uid)
 std::string FileSystem::getDBPath() const
 {
     std::stringstream ss;
-    ss << RW_DATA_DIR << CKM_DB_PREFIX << m_uid;
+    ss << RW_DATA_DIR << "/" << CKM_DB_PREFIX << m_uid;
     return ss.str();
 }
 
 std::string FileSystem::getDKEKPath() const
 {
     std::stringstream ss;
-    ss << RW_DATA_DIR << CKM_KEY_PREFIX << m_uid;
+    ss << RW_DATA_DIR << "/" << CKM_KEY_PREFIX << m_uid;
     return ss.str();
 }
 
 std::string FileSystem::getDBDEKPath() const
 {
     std::stringstream ss;
-    ss << RW_DATA_DIR << CKM_DB_KEY_PREFIX << m_uid;
+    ss << RW_DATA_DIR << "/" << CKM_DB_KEY_PREFIX << m_uid;
     return ss.str();
 }
 
 std::string FileSystem::getRemovedAppsPath() const
 {
     std::stringstream ss;
-    ss << RW_DATA_DIR << CKM_REMOVED_APP_PREFIX << m_uid;
+    ss << RW_DATA_DIR << "/" << CKM_REMOVED_APP_PREFIX << m_uid;
     return ss.str();
 }
 
@@ -201,7 +201,7 @@ UidVector FileSystem::getUIDsFromDBFile()
     std::unique_ptr<struct dirent, std::function<void(void*)>>
         pEntry(static_cast<struct dirent*>(::malloc(len)), ::free);
 
-    if (!pEntry.get()) {
+    if (!pEntry) {
         LogError("Memory allocation failed.");
         return UidVector();
     }

diff --git a/systemd/central-key-manager-api-control.socket b/systemd/central-key-manager-api-control.socket
index fe58e42..2a0cb83 100644 (file)
--- a/systemd/central-key-manager-api-control.socket
+++ b/systemd/central-key-manager-api-control.socket
@@ -1,6 +1,6 @@
 [Socket]
 ListenStream=/tmp/.central-key-manager-api-control.sock
-SocketMode=0700
+SocketMode=0777
 
 Service=central-key-manager.service
 

diff --git a/systemd/central-key-manager.service.in b/systemd/central-key-manager.service.in
index c516c41..c03c723 100644 (file)
--- a/systemd/central-key-manager.service.in
+++ b/systemd/central-key-manager.service.in
@@ -7,7 +7,7 @@ User=@USER_NAME@
 Group=@GROUP_NAME@
 SmackProcessLabel=@SMACK_DOMAIN_NAME@
 Type=notify
-ExecStart=/usr/bin/key-manager
+ExecStart=@BIN_DIR@/key-manager
 Sockets=central-key-manager-api-storage.socket
 Sockets=central-key-manager-api-control.socket
 Sockets=central-key-manager-api-ocsp.socket

diff --git a/tests/encryption-scheme/scheme-test.cpp b/tests/encryption-scheme/scheme-test.cpp
index cdf90dd..f154e40 100644 (file)
--- a/tests/encryption-scheme/scheme-test.cpp
+++ b/tests/encryption-scheme/scheme-test.cpp
@@ -268,8 +268,8 @@ gid_t getGid(const char *name) {
 void restoreFile(const string& filename) {
     static uid_t CKM_UID = getUid(USER_NAME);
     static gid_t CKM_GID = getGid(GROUP_NAME);
-    string sourcePath = string(DB_TEST_DIR) + filename;
-    string targetPath = string(RW_DATA_DIR) + filename;
+    string sourcePath = string(DB_TEST_DIR) + "/" + filename;
+    string targetPath = string(RW_DATA_DIR) + "/" + filename;
 
     int err, ret;
 

diff --git a/tests/test_xml-parser.cpp b/tests/test_xml-parser.cpp
index 514683b..4469261 100644 (file)
--- a/tests/test_xml-parser.cpp
+++ b/tests/test_xml-parser.cpp
@@ -41,7 +41,7 @@ const char *XSD_4_device_key    = "XML_4_device_key.xsd";
 
 std::string format_test_path(const char *file)
 {
-    return std::string(DB_TEST_DIR) + std::string(file);
+    return std::string(DB_TEST_DIR) + "/" + std::string(file);
 }
 
 bool startCallbackFlag = false;

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 8764fad..c824559 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -9,7 +9,7 @@ TARGET_LINK_LIBRARIES(${CKM_SO_LOADER} -ldl)
 
 #place for output file
 INSTALL(TARGETS ${CKM_SO_LOADER}
-    DESTINATION /usr/bin
+    DESTINATION ${BIN_DIR}
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
                 OWNER_EXECUTE
@@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(${CKM_TOOL}
 
 #place for output file
 INSTALL(TARGETS ${CKM_TOOL}
-    DESTINATION /usr/bin
+    DESTINATION ${BIN_DIR}
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
                 OWNER_EXECUTE
@@ -45,5 +45,4 @@ INSTALL(TARGETS ${CKM_TOOL}
                 WORLD_READ
                 WORLD_EXECUTE
      )
-
-ADD_SUBDIRECTORY(ckm_db_tool)
\ No newline at end of file
+ADD_SUBDIRECTORY(ckm_db_tool)

diff --git a/tools/ckm_db_tool/CMakeLists.txt b/tools/ckm_db_tool/CMakeLists.txt
index 309703a..7fe71fd 100644 (file)
--- a/tools/ckm_db_tool/CMakeLists.txt
+++ b/tools/ckm_db_tool/CMakeLists.txt
@@ -83,7 +83,7 @@ TARGET_LINK_LIBRARIES(${CKM_DB_TOOL}
 
 #place for output file
 INSTALL(TARGETS ${CKM_DB_TOOL}
-    DESTINATION /usr/bin
+    DESTINATION ${BIN_DIR}
     PERMISSIONS OWNER_READ
                 OWNER_WRITE
                 OWNER_EXECUTE