Codebase list mozc / af291f1
Fix up missing file permissions during installation This CL addresses the missing file permission issue on machines that were upgraded from Windows 7 to Windows 8 or later versions. In order to support sandboxed applications on on Windows 8 and later OSes, certain Mozc executables need to allow read/execute access for "ALL APPLICATION PACKAGES" group. This is basically done by default if Windows 8 or later OS is fresh-installed because "Program Files" already has such an ACL (Access Control Entry) with inheritable bit. If the machine was upgraded from Windows 7 or prior, however, already existing folders such as "Program Files/Google" may not have such an ACE even after OS upgrade. For those machines, Mozc needs to manually fix up permissions in the installer. For now following four files need to be accessible from sandboxed applications. - GoogleIMEJaTIP32.dll (mozc_tip32.dll) - GoogleIMEJaTIP64.dll (mozc_tip64.dll) - GoogleIMEJaConverter.exe (mozc_server.exe) - GoogleIMEJaRenderer.exe (mozc_renderer.exe) To be precise, last two files just need to be visible to first two files running in sandboxed applications to make sure IPC servers are valid (by using GetNamedPipeServerProcessId API). Note that Windows does not require the parent directly also needs to be readable. We can basically care only about those fore files' permission. There are basically two ways to fix up in our installer. One is to write such logic by C++ and run as a custom action, and the other is to let Windows Installer do by using MsiLockPermissionsEx table. The later idea is actually easier. We can use MsiLockPermissionsEx as follows. <Component Id='GIMEJaTIP64' Guid='*' Permanent='no'> <File Id='GoogleIMEJaTIP64.dll' Name='GoogleIMEJaTIP64.dll' DiskId='1' Checksum='yes' Source='$(var.MozcTIP64Path)' Vital='yes'> <PermissionEx Sddl="O:SYG:SYD:AI(A;;0x1200a9;;;AC)(A;ID;FA;;;SY)(A;ID;FA;;;BA)(A;ID;0x1200a9;;;BU)(A;ID;0x1200a9;;;AC)"> </File> </Component> However, if we use MsiLockPermissionsEx, Windows Installer always overwrites existing file permissions, which could cause some troubles if later version of Windows starts adding a new permission to directories under "Program Files". Therefore, this CL uses a custom action as a more predictable and reliable way to just fix up a missing permission. BUG= TEST= REF_BUG=31902088 REF_CL=137117790 REF_TIME=2016-10-24T22:02:44-07:00 REF_TIME_RAW=1477371764 -0700 Yohei Yukawa 7 years ago
8 changed file(s) with 101 addition(s) and 3 deletion(s). Raw diff Collapse all Expand all
+41
-0
src/base/win_sandbox.cc less more
3535 #include <sddl.h>
3636 #include <strsafe.h>
3737
38 #include <atlsecurity.h>
39
3840 #include <memory>
3941 #include <string>
4042
14271429 return true;
14281430 }
14291431
1432 bool WinSandbox::EnsureAllApplicationPackagesPermisssion(
1433 const wstring &file_name) {
1434 // Get "All Application Packages" group SID.
1435 const ATL::CSid all_application_packages(
1436 Sid(WinBuiltinAnyPackageSid).GetPSID());
1437
1438 // Get current DACL (Discretionary Access Control List) of |file_name|.
1439 ATL::CDacl dacl;
1440 if (!ATL::AtlGetDacl(file_name.c_str(), SE_FILE_OBJECT, &dacl)) {
1441 return false;
1442 }
1443
1444 // As of Windows 10 Anniversary Update, following access masks (==0x1200a9)
1445 // are specified to files under Program Files by default.
1446 const ACCESS_MASK kDesiredMask =
1447 FILE_READ_DATA | FILE_READ_EA | FILE_EXECUTE | READ_CONTROL | SYNCHRONIZE;
1448
1449 // Check if the desired ACE is already specified or not.
1450 for (UINT i = 0; i < dacl.GetAceCount(); ++i) {
1451 CSid ace_sid;
1452 ACCESS_MASK acess_mask = 0;
1453 BYTE ace_type = 0;
1454 dacl.GetAclEntry(i, &ace_sid, &acess_mask, &ace_type);
1455 if (ace_sid == all_application_packages &&
1456 ace_type == ACCESS_ALLOWED_ACE_TYPE &&
1457 (acess_mask & kDesiredMask) == kDesiredMask) {
1458 // This is the desired ACE. There is nothing to do.
1459 return true;
1460 }
1461 }
1462
1463 // We are here because there is no desired ACE. Hence we do add it.
1464 if (!dacl.AddAllowedAce(
1465 all_application_packages, kDesiredMask, ACCESS_ALLOWED_ACE_TYPE)) {
1466 return false;
1467 }
1468 return ATL::AtlSetDacl(file_name.c_str(), SE_FILE_OBJECT, dacl);
1469 }
1470
14301471 } // namespace mozc
14311472 #endif // OS_WIN
+10
-0
src/base/win_sandbox.h less more
183183 IntegrityLevel integrity_level,
184184 ScopedHandle* restricted_token);
185185
186 // Returns true |file_name| already has or is updated to have an ACE
187 // (Access Control Entry) for "All Application Packages" group to have the
188 // following access masks:
189 // - FILE_READ_DATA
190 // - FILE_READ_EA
191 // - FILE_EXECUTE
192 // - READ_CONTROL
193 // - SYNCHRONIZE
194 static bool EnsureAllApplicationPackagesPermisssion(const wstring &file_name);
195
186196 protected:
187197 // Returns SDDL for given |shareble_object_type|.
188198 // This method is placed here for unit testing.
+1
-1
src/data/version/mozc_version_template.bzl less more
2929
3030 MAJOR=2
3131 MINOR=19
32 BUILD=2654
32 BUILD=2655
3333 REVISION=102
3434 # This version represents the version of Mozc IME engine (converter, predictor,
3535 # etc.). This version info is included both in the Mozc server and in the Mozc
+25
-0
src/win32/custom_action/custom_action.cc less more
4646 #include "base/url.h"
4747 #include "base/util.h"
4848 #include "base/version.h"
49 #include "base/win_sandbox.h"
4950 #include "base/win_util.h"
5051 #include "client/client_interface.h"
5152 #include "config/stats_config_util.h"
236237 return TRUE;
237238 }
238239
240 // [Return='ignore']
241 UINT __stdcall EnsureAllApplicationPackagesPermisssions(MSIHANDLE msi_handle) {
242 DEBUG_BREAK_FOR_DEBUGGER();
243 if (!mozc::WinSandbox::EnsureAllApplicationPackagesPermisssion(
244 GetMozcComponentPath(mozc::kMozcServerName))) {
245 return ERROR_INSTALL_FAILURE;
246 }
247 if (!mozc::WinSandbox::EnsureAllApplicationPackagesPermisssion(
248 GetMozcComponentPath(mozc::kMozcRenderer))) {
249 return ERROR_INSTALL_FAILURE;
250 }
251 if (!mozc::WinSandbox::EnsureAllApplicationPackagesPermisssion(
252 GetMozcComponentPath(mozc::kMozcTIP32))) {
253 return ERROR_INSTALL_FAILURE;
254 }
255 if (mozc::SystemUtil::IsWindowsX64()) {
256 if (!mozc::WinSandbox::EnsureAllApplicationPackagesPermisssion(
257 GetMozcComponentPath(mozc::kMozcTIP64))) {
258 return ERROR_INSTALL_FAILURE;
259 }
260 }
261 return ERROR_SUCCESS;
262 }
263
239264 UINT __stdcall CallIERefreshElevationPolicy(MSIHANDLE msi_handle) {
240265 DEBUG_BREAK_FOR_DEBUGGER();
241266 HRESULT result = ::IERefreshElevationPolicy();
+1
-0
src/win32/custom_action/custom_action.def less more
00 EXPORTS
1 EnsureAllApplicationPackagesPermisssions
12 CallIERefreshElevationPolicy
23 InstallIME
34 InstallIMERollback
+4
-0
src/win32/custom_action/custom_action.h less more
3333
3434 #include <windows.h>
3535 #include <msi.h>
36
37 // Ensures that "ALL APPLICATION PACKAGES" group has read/execute accesses
38 // to server, renderer, and TIP DLL files.
39 UINT __stdcall EnsureAllApplicationPackagesPermisssions(MSIHANDLE msi_handle);
3640
3741 // Makes ieuser.exe update the cache of the elevation policies.
3842 UINT __stdcall CallIERefreshElevationPolicy(MSIHANDLE msi_handle);
+10
-1
src/win32/installer/installer_32bit.wxs less more
772772 <CustomAction Id='UnregisterTIPRollback32' BinaryKey='CustomActions32'
773773 DllEntry='UnregisterTIPRollback' Execute='rollback' Impersonate='no'
774774 Return='ignore' />
775 <CustomAction Id='EnsureAllApplicationPackagesPermisssions'
776 BinaryKey='CustomActions32'
777 DllEntry='EnsureAllApplicationPackagesPermisssions' Execute='deferred'
778 Impersonate='no' Return='ignore' />
775779 <CustomAction Id='CallIERefreshElevationPolicy' BinaryKey='CustomActions32'
776780 DllEntry='CallIERefreshElevationPolicy' Execute='commit' Impersonate='no' />
777781 <CustomAction Id='OpenUninstallSurveyPage' BinaryKey='CustomActions32'
902906 <Custom Action='RegisterTIPRollback32' Before='RegisterTIP32' >
903907 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602) AND (NOT UPGRADING)
904908 </Custom>
905 <Custom Action='RegisterTIP32' Before='EnsureIMEIsDisabledForServiceAccountAfterInstall' >
909 <Custom Action='RegisterTIP32'
910 Before='EnsureAllApplicationPackagesPermisssions' >
911 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602)
912 </Custom>
913 <Custom Action='EnsureAllApplicationPackagesPermisssions'
914 Before='EnsureIMEIsDisabledForServiceAccountAfterInstall' >
906915 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602)
907916 </Custom>
908917 <Custom Action='EnsureIMEIsDisabledForServiceAccountAfterInstall'
+9
-1
src/win32/installer/installer_64bit.wxs less more
861861 <CustomAction Id='UnregisterTIPRollback64' BinaryKey='CustomActions64'
862862 DllEntry='UnregisterTIPRollback' Execute='rollback' Impersonate='no'
863863 Return='ignore' />
864 <CustomAction Id='EnsureAllApplicationPackagesPermisssions'
865 BinaryKey='CustomActions64'
866 DllEntry='EnsureAllApplicationPackagesPermisssions' Execute='deferred'
867 Impersonate='no' Return='ignore' />
864868 <CustomAction Id='CallIERefreshElevationPolicy' BinaryKey='CustomActions32'
865869 DllEntry='CallIERefreshElevationPolicy' Execute='commit' Impersonate='no' />
866870 <CustomAction Id='OpenUninstallSurveyPage' BinaryKey='CustomActions32'
10061010 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602) AND (VersionNT64) AND (NOT UPGRADING)
10071011 </Custom>
10081012 <Custom Action='RegisterTIP64'
1013 Before='EnsureAllApplicationPackagesPermisssions' >
1014 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602) AND (VersionNT64)
1015 </Custom>
1016 <Custom Action='EnsureAllApplicationPackagesPermisssions'
10091017 Before='EnsureIMEIsDisabledForServiceAccountAfterInstall' >
1010 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602) AND (VersionNT64)
1018 (NOT (REMOVE="ALL")) AND (VersionNT &gt;= 602)
10111019 </Custom>
10121020 <Custom Action='EnsureIMEIsDisabledForServiceAccountAfterInstall'
10131021 Before='InstallFinalize' >