Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Consider target path when verifyIdmap." into rvc-dev am: fa0f02a91c am: ae090e286f am: 690bac7829 am: 8245bce4de

Browse Source 
Change-Id: Idcb1d58694444e47ce6442548b67b293ccccfd38
This commit is contained in:
Ryan Mitchell
2020-03-30 18:18:27 +00:00
committed by Automerger Merge Worker
parent c928850493 8245bce4de
commit fdb1e0703d
6 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/idmap2/idmap2/CreateMultiple.cpp
View File

@@ -22,6 +22,7 @@
#include <ostream>
#include <vector>
#include "Commands.h"
#include "android-base/stringprintf.h"
#include "idmap2/BinaryStreamVisitor.h"
#include "idmap2/CommandLineOptions.h"
@@ -30,7 +31,6 @@
#include "idmap2/Policies.h"
#include "idmap2/PolicyUtils.h"
#include "idmap2/SysTrace.h"
#include "Commands.h"
using android::ApkAssets;
using android::base::StringPrintf;

12
cmds/idmap2/idmap2d/Idmap2Service.cpp
View File

@@ -93,7 +93,8 @@ Status Idmap2Service::removeIdmap(const std::string& overlay_apk_path,
return ok();
}
Status Idmap2Service::verifyIdmap(const std::string& overlay_apk_path,
Status Idmap2Service::verifyIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path,
int32_t fulfilled_policies ATTRIBUTE_UNUSED,
bool enforce_overlayable ATTRIBUTE_UNUSED,
int32_t user_id ATTRIBUTE_UNUSED, bool* _aidl_return) {
@@ -103,10 +104,15 @@ Status Idmap2Service::verifyIdmap(const std::string& overlay_apk_path,
std::ifstream fin(idmap_path);
const std::unique_ptr<const IdmapHeader> header = IdmapHeader::FromBinaryStream(fin);
fin.close();
*_aidl_return = header && header->IsUpToDate();
if (!header) {
*_aidl_return = false;
return error("failed to parse idmap header");
}
*_aidl_return =
strcmp(header->GetTargetPath().data(), target_apk_path.data()) == 0 && header->IsUpToDate();
// TODO(b/119328308): Check that the set of fulfilled policies of the overlay has not changed
return ok();
}

3
cmds/idmap2/idmap2d/Idmap2Service.h
View File

@@ -37,7 +37,8 @@ class Idmap2Service : public BinderService<Idmap2Service>, public BnIdmap2 {
binder::Status removeIdmap(const std::string& overlay_apk_path, int32_t user_id,
bool* _aidl_return) override;
binder::Status verifyIdmap(const std::string& overlay_apk_path, int32_t fulfilled_policies,
binder::Status verifyIdmap(const std::string& target_apk_path,
const std::string& overlay_apk_path, int32_t fulfilled_policies,
bool enforce_overlayable, int32_t user_id,
bool* _aidl_return) override;

7
cmds/idmap2/idmap2d/aidl/android/os/IIdmap2.aidl
View File

@@ -22,8 +22,11 @@ package android.os;
interface IIdmap2 {
@utf8InCpp String getIdmapPath(@utf8InCpp String overlayApkPath, int userId);
boolean removeIdmap(@utf8InCpp String overlayApkPath, int userId);
boolean verifyIdmap(@utf8InCpp String overlayApkPath, int fulfilledPolicies,
boolean enforceOverlayable, int userId);
boolean verifyIdmap(@utf8InCpp String targetApkPath,
@utf8InCpp String overlayApkPath,
int fulfilledPolicies,
boolean enforceOverlayable,
int userId);
@nullable @utf8InCpp String createIdmap(@utf8InCpp String targetApkPath,
@utf8InCpp String overlayApkPath,
int fulfilledPolicies,

5
services/core/java/com/android/server/om/IdmapDaemon.java
View File

@@ -116,10 +116,11 @@ class IdmapDaemon {
}
}
boolean verifyIdmap(String overlayPath, int policies, boolean enforce, int userId)
boolean verifyIdmap(String targetPath, String overlayPath, int policies, boolean enforce,
int userId)
throws Exception {
try (Connection connection = connect()) {
return mService.verifyIdmap(overlayPath, policies, enforce, userId);
return mService.verifyIdmap(targetPath, overlayPath, policies, enforce, userId);
}
}

2
services/core/java/com/android/server/om/IdmapManager.java
View File

@@ -75,7 +75,7 @@ class IdmapManager {
try {
int policies = calculateFulfilledPolicies(targetPackage, overlayPackage, userId);
boolean enforce = enforceOverlayable(overlayPackage);
if (mIdmapDaemon.verifyIdmap(overlayPath, policies, enforce, userId)) {
if (mIdmapDaemon.verifyIdmap(targetPath, overlayPath, policies, enforce, userId)) {
return true;
}
return mIdmapDaemon.createIdmap(targetPath, overlayPath, policies,