diff options
Diffstat (limited to 'src/com')
5 files changed, 400 insertions, 135 deletions
diff --git a/src/com/android/packageinstaller/GrantActivity.java b/src/com/android/packageinstaller/GrantActivity.java new file mode 100644 index 00000000..a3f7f5c9 --- /dev/null +++ b/src/com/android/packageinstaller/GrantActivity.java @@ -0,0 +1,229 @@ +/* +** Copyright 2013, The Android Open Source Project +** +** 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. +*/ + +package com.android.packageinstaller; + +import android.app.Activity; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; +import android.content.pm.PermissionInfo; +import android.os.Bundle; +import android.support.v4.view.ViewPager; +import android.view.LayoutInflater; +import android.view.View; +import android.view.View.OnClickListener; +import android.view.ViewGroup; +import android.widget.AppSecurityPermissions; +import android.widget.Button; +import android.widget.TabHost; +import android.widget.TextView; + +import java.util.ArrayList; +import java.util.List; + +/* + * The activity which is responsible for asking the user to grant permissions + * to applications. + */ +public class GrantActivity extends Activity implements OnClickListener { + private Button mOk; + private Button mCancel; + private PackageManager mPm; + private String mRequestingPackage; + private String[] requested_permissions; + + @Override + public void onCreate(Bundle icicle) { + super.onCreate(icicle); + mPm = getPackageManager(); + mRequestingPackage = this.getCallingPackage(); + + requested_permissions = getRequestedPermissions(); + if (requested_permissions.length == 0) { + // The grant request was empty. Return success + setResult(RESULT_OK); + finish(); + return; + } + + PackageInfo pkgInfo = getUpdatedPackageInfo(); + AppSecurityPermissions perms = new AppSecurityPermissions(this, pkgInfo); + if (perms.getPermissionCount(AppSecurityPermissions.WHICH_NEW) == 0) { + // The updated permissions dialog said there are no new permissions. + // This should never occur if requested_permissions.length > 0, + // but we check for it anyway, just in case. + setResult(RESULT_OK); + finish(); + return; + } + + setContentView(R.layout.install_start); + ((TextView)findViewById(R.id.install_confirm_question)).setText(R.string.grant_confirm_question); + PackageUtil.AppSnippet as = new PackageUtil.AppSnippet(mPm.getApplicationLabel(pkgInfo.applicationInfo), + mPm.getApplicationIcon(pkgInfo.applicationInfo)); + PackageUtil.initSnippetForNewApp(this, as, R.id.app_snippet); + mOk = (Button)findViewById(R.id.ok_button); + mOk.setText(R.string.ok); + mCancel = (Button)findViewById(R.id.cancel_button); + mOk.setOnClickListener(this); + mCancel.setOnClickListener(this); + + TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); + tabHost.setup(); + ViewPager viewPager = (ViewPager) findViewById(R.id.pager); + TabsAdapter adapter = new TabsAdapter(this, tabHost, viewPager); + + View newTab = perms.getPermissionsView(AppSecurityPermissions.WHICH_NEW); + View allTab = getPermissionList(perms); + + adapter.addTab(tabHost.newTabSpec("new").setIndicator( + getText(R.string.newPerms)), newTab); + adapter.addTab(tabHost.newTabSpec("all").setIndicator( + getText(R.string.allPerms)), allTab); + } + + /** + * Returns a PackageInfo object representing the results of adding all the permissions + * in {@code requested_permissions} to {@code mRequestingPackage}. This is the package + * permissions the user will have if they accept the grant request. + */ + private PackageInfo getUpdatedPackageInfo() { + try { + PackageInfo pkgInfo = mPm.getPackageInfo(mRequestingPackage, PackageManager.GET_PERMISSIONS); + for (int i = 0; i < pkgInfo.requestedPermissions.length; i++) { + for (String requested_permission : requested_permissions) { + if (requested_permission.equals(pkgInfo.requestedPermissions[i])) { + pkgInfo.requestedPermissionsFlags[i] |= PackageInfo.REQUESTED_PERMISSION_GRANTED; + } + } + } + + return pkgInfo; + } catch (NameNotFoundException e) { + throw new RuntimeException(e); // will never occur + } + } + + private View getPermissionList(AppSecurityPermissions perms) { + LayoutInflater inflater = (LayoutInflater)getSystemService(Context.LAYOUT_INFLATER_SERVICE); + View root = inflater.inflate(R.layout.permissions_list, null); + View personalPermissions = perms.getPermissionsView(AppSecurityPermissions.WHICH_PERSONAL); + View devicePermissions = perms.getPermissionsView(AppSecurityPermissions.WHICH_DEVICE); + + ((ViewGroup)root.findViewById(R.id.privacylist)).addView(personalPermissions); + ((ViewGroup)root.findViewById(R.id.devicelist)).addView(devicePermissions); + + return root; + } + + /** + * Return an array of permissions requested by the caller, filtered to exclude + * irrelevant or otherwise malicious permission requests from untrusted callers. + */ + private String[] getRequestedPermissions() { + String[] permissions = getIntent() + .getStringArrayExtra(PackageManager.EXTRA_REQUEST_PERMISSION_PERMISSION_LIST); + if (permissions == null) { + return new String[0]; + } + permissions = keepNormalDangerousPermissions(permissions); + permissions = keepRequestingPackagePermissions(permissions); + return permissions; + + } + + /** + * Remove any permissions in {@code permissions} which are not present + * in {@code mRequestingPackage} and return the result. We also filter out + * permissions which are required by {@code mRequestingPackage}, and permissions + * which have already been granted to {@code mRequestingPackage}, as those permissions + * are useless to change. + */ + private String[] keepRequestingPackagePermissions(String[] permissions) { + List<String> result = new ArrayList<String>(); + try { + PackageInfo pkgInfo = mPm.getPackageInfo(mRequestingPackage, PackageManager.GET_PERMISSIONS); + if (pkgInfo.requestedPermissions == null) { + return new String[0]; + } + for (int i = 0; i < pkgInfo.requestedPermissions.length; i++) { + for (String permission : permissions) { + final boolean isRequired = + ((pkgInfo.requestedPermissionsFlags[i] + & PackageInfo.REQUESTED_PERMISSION_REQUIRED) != 0); + final boolean isGranted = + ((pkgInfo.requestedPermissionsFlags[i] + & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0); + + /* + * We ignore required permissions, and permissions which have already + * been granted, as it's useless to grant those permissions. + */ + if (permission.equals(pkgInfo.requestedPermissions[i]) + && !isRequired && !isGranted) { + result.add(permission); + break; + } + } + } + } catch (NameNotFoundException e) { + throw new RuntimeException(e); // should never happen + } + return result.toArray(new String[result.size()]); + } + + /** + * Filter the permissions in {@code permissions}, keeping only the NORMAL or DANGEROUS + * permissions. + * + * @param permissions the permissions to filter + * @return A subset of {@code permissions} with only the + * NORMAL or DANGEROUS permissions kept + */ + private String[] keepNormalDangerousPermissions(String[] permissions) { + List<String> result = new ArrayList<String>(); + for (String permission : permissions) { + try { + PermissionInfo pInfo = mPm.getPermissionInfo(permission, 0); + final int base = pInfo.protectionLevel & PermissionInfo.PROTECTION_MASK_BASE; + if ((base != PermissionInfo.PROTECTION_NORMAL) + && (base != PermissionInfo.PROTECTION_DANGEROUS)) { + continue; + } + result.add(permission); + } catch (NameNotFoundException e) { + // ignore + } + } + return result.toArray(new String[result.size()]); + } + + @Override + public void onClick(View v) { + if (v == mOk) { + for (String permission : requested_permissions) { + mPm.grantPermission(mRequestingPackage, permission); + } + setResult(RESULT_OK); + } + if (v == mCancel) { + setResult(RESULT_CANCELED); + } + finish(); + } +} diff --git a/src/com/android/packageinstaller/InstallAppProgress.java b/src/com/android/packageinstaller/InstallAppProgress.java index fc820782..71c792ee 100755 --- a/src/com/android/packageinstaller/InstallAppProgress.java +++ b/src/com/android/packageinstaller/InstallAppProgress.java @@ -24,6 +24,7 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageInstallObserver; +import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManager.NameNotFoundException; @@ -54,6 +55,8 @@ import java.util.List; public class InstallAppProgress extends Activity implements View.OnClickListener, OnCancelListener { private final String TAG="InstallAppProgress"; private boolean localLOGV = false; + static final String EXTRA_MANIFEST_DIGEST = + "com.android.packageinstaller.extras.manifest_digest"; private ApplicationInfo mAppInfo; private Uri mPackageURI; private ProgressBar mProgressBar; @@ -254,8 +257,9 @@ public class InstallAppProgress extends Activity implements View.OnClickListener Uri referrer = getIntent().getParcelableExtra(Intent.EXTRA_REFERRER); int originatingUid = getIntent().getIntExtra(Intent.EXTRA_ORIGINATING_UID, VerificationParams.NO_UID); + ManifestDigest manifestDigest = getIntent().getParcelableExtra(EXTRA_MANIFEST_DIGEST); VerificationParams verificationParams = new VerificationParams(null, originatingURI, - referrer, originatingUid, null); + referrer, originatingUid, manifestDigest); PackageInstallObserver observer = new PackageInstallObserver(); if ("package".equals(mPackageURI.getScheme())) { diff --git a/src/com/android/packageinstaller/PackageInstallerActivity.java b/src/com/android/packageinstaller/PackageInstallerActivity.java index 4a6db210..afe6e012 100644 --- a/src/com/android/packageinstaller/PackageInstallerActivity.java +++ b/src/com/android/packageinstaller/PackageInstallerActivity.java @@ -26,17 +26,16 @@ import android.content.DialogInterface.OnCancelListener; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; +import android.content.pm.ManifestDigest; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.PackageUserState; import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageParser; +import android.content.pm.PackageUserState; import android.content.pm.VerificationParams; -import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.provider.Settings; -import android.support.v4.view.PagerAdapter; import android.support.v4.view.ViewPager; import android.util.Log; import android.view.LayoutInflater; @@ -45,13 +44,10 @@ import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.AppSecurityPermissions; import android.widget.Button; -import android.widget.ScrollView; import android.widget.TabHost; -import android.widget.TabWidget; import android.widget.TextView; import java.io.File; -import java.util.ArrayList; /* * This activity is launched when a new application is installed via side loading @@ -69,6 +65,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private Uri mOriginatingURI; private Uri mReferrerURI; private int mOriginatingUid = VerificationParams.NO_UID; + private ManifestDigest mPkgDigest; private boolean localLOGV = false; PackageManager mPm; @@ -96,132 +93,6 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen private static final int DLG_INSTALL_ERROR = DLG_BASE + 4; private static final int DLG_ALLOW_SOURCE = DLG_BASE + 5; - /** - * This is a helper class that implements the management of tabs and all - * details of connecting a ViewPager with associated TabHost. It relies on a - * trick. Normally a tab host has a simple API for supplying a View or - * Intent that each tab will show. This is not sufficient for switching - * between pages. So instead we make the content part of the tab host - * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy - * view to show as the tab content. It listens to changes in tabs, and takes - * care of switch to the correct paged in the ViewPager whenever the selected - * tab changes. - */ - public static class TabsAdapter extends PagerAdapter - implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener { - private final Context mContext; - private final TabHost mTabHost; - private final ViewPager mViewPager; - private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); - private final Rect mTempRect = new Rect(); - - static final class TabInfo { - private final String tag; - private final View view; - - TabInfo(String _tag, View _view) { - tag = _tag; - view = _view; - } - } - - static class DummyTabFactory implements TabHost.TabContentFactory { - private final Context mContext; - - public DummyTabFactory(Context context) { - mContext = context; - } - - @Override - public View createTabContent(String tag) { - View v = new View(mContext); - v.setMinimumWidth(0); - v.setMinimumHeight(0); - return v; - } - } - - public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) { - mContext = activity; - mTabHost = tabHost; - mViewPager = pager; - mTabHost.setOnTabChangedListener(this); - mViewPager.setAdapter(this); - mViewPager.setOnPageChangeListener(this); - } - - public void addTab(TabHost.TabSpec tabSpec, View view) { - tabSpec.setContent(new DummyTabFactory(mContext)); - String tag = tabSpec.getTag(); - - TabInfo info = new TabInfo(tag, view); - mTabs.add(info); - mTabHost.addTab(tabSpec); - notifyDataSetChanged(); - } - - @Override - public int getCount() { - return mTabs.size(); - } - - @Override - public Object instantiateItem(ViewGroup container, int position) { - View view = mTabs.get(position).view; - container.addView(view); - return view; - } - - @Override - public void destroyItem(ViewGroup container, int position, Object object) { - container.removeView((View)object); - } - - @Override - public boolean isViewFromObject(View view, Object object) { - return view == object; - } - - @Override - public void onTabChanged(String tabId) { - int position = mTabHost.getCurrentTab(); - mViewPager.setCurrentItem(position); - } - - @Override - public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { - } - - @Override - public void onPageSelected(int position) { - // Unfortunately when TabHost changes the current tab, it kindly - // also takes care of putting focus on it when not in touch mode. - // The jerk. - // This hack tries to prevent this from pulling focus out of our - // ViewPager. - TabWidget widget = mTabHost.getTabWidget(); - int oldFocusability = widget.getDescendantFocusability(); - widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); - mTabHost.setCurrentTab(position); - widget.setDescendantFocusability(oldFocusability); - - // Scroll the current tab into visibility if needed. - View tab = widget.getChildTabViewAt(position); - mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom()); - widget.requestRectangleOnScreen(mTempRect, false); - - // Make sure the scrollbars are visible for a moment after selection - final View contentView = mTabs.get(position).view; - if (contentView instanceof CaffeinatedScrollView) { - ((CaffeinatedScrollView) contentView).awakenScrollBars(); - } - } - - @Override - public void onPageScrollStateChanged(int state) { - } - } - private void startInstallConfirm() { TabHost tabHost = (TabHost)findViewById(android.R.id.tabhost); tabHost.setup(); @@ -520,6 +391,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mPkgInfo = PackageParser.generatePackageInfo(parsed, null, PackageManager.GET_PERMISSIONS, 0, 0, null, new PackageUserState()); + mPkgDigest = parsed.manifestDigest; as = PackageUtil.getAppSnippet(this, mPkgInfo.applicationInfo, sourceFile); } @@ -656,6 +528,7 @@ public class PackageInstallerActivity extends Activity implements OnCancelListen mPkgInfo.applicationInfo); newIntent.setData(mPackageURI); newIntent.setClass(this, InstallAppProgress.class); + newIntent.putExtra(InstallAppProgress.EXTRA_MANIFEST_DIGEST, mPkgDigest); String installerPackageName = getIntent().getStringExtra( Intent.EXTRA_INSTALLER_PACKAGE_NAME); if (mOriginatingURI != null) { diff --git a/src/com/android/packageinstaller/PackageUtil.java b/src/com/android/packageinstaller/PackageUtil.java index 8681bfc7..650e7fb1 100644 --- a/src/com/android/packageinstaller/PackageUtil.java +++ b/src/com/android/packageinstaller/PackageUtil.java @@ -72,8 +72,12 @@ public class PackageUtil { metrics.setToDefaults(); PackageParser.Package pkg = packageParser.parsePackage(sourceFile, archiveFilePath, metrics, 0); - // Nuke the parser reference. - packageParser = null; + if (pkg == null) { + return null; + } + if (!packageParser.collectManifestDigest(pkg)) { + return null; + } return pkg; } diff --git a/src/com/android/packageinstaller/TabsAdapter.java b/src/com/android/packageinstaller/TabsAdapter.java new file mode 100644 index 00000000..3509e092 --- /dev/null +++ b/src/com/android/packageinstaller/TabsAdapter.java @@ -0,0 +1,155 @@ +/* +** +** Copyright 2013, The Android Open Source Project +** +** 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. +*/ +package com.android.packageinstaller; + +import android.app.Activity; +import android.content.Context; +import android.graphics.Rect; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TabHost; +import android.widget.TabWidget; + +import java.util.ArrayList; + +/** + * This is a helper class that implements the management of tabs and all + * details of connecting a ViewPager with associated TabHost. It relies on a + * trick. Normally a tab host has a simple API for supplying a View or + * Intent that each tab will show. This is not sufficient for switching + * between pages. So instead we make the content part of the tab host + * 0dp high (it is not shown) and the TabsAdapter supplies its own dummy + * view to show as the tab content. It listens to changes in tabs, and takes + * care of switch to the correct paged in the ViewPager whenever the selected + * tab changes. + */ +public class TabsAdapter extends PagerAdapter + implements TabHost.OnTabChangeListener, ViewPager.OnPageChangeListener { + private final Context mContext; + private final TabHost mTabHost; + private final ViewPager mViewPager; + private final ArrayList<TabInfo> mTabs = new ArrayList<TabInfo>(); + private final Rect mTempRect = new Rect(); + + static final class TabInfo { + private final String tag; + private final View view; + + TabInfo(String _tag, View _view) { + tag = _tag; + view = _view; + } + } + + static class DummyTabFactory implements TabHost.TabContentFactory { + private final Context mContext; + + public DummyTabFactory(Context context) { + mContext = context; + } + + @Override + public View createTabContent(String tag) { + View v = new View(mContext); + v.setMinimumWidth(0); + v.setMinimumHeight(0); + return v; + } + } + + public TabsAdapter(Activity activity, TabHost tabHost, ViewPager pager) { + mContext = activity; + mTabHost = tabHost; + mViewPager = pager; + mTabHost.setOnTabChangedListener(this); + mViewPager.setAdapter(this); + mViewPager.setOnPageChangeListener(this); + } + + public void addTab(TabHost.TabSpec tabSpec, View view) { + tabSpec.setContent(new DummyTabFactory(mContext)); + String tag = tabSpec.getTag(); + + TabInfo info = new TabInfo(tag, view); + mTabs.add(info); + mTabHost.addTab(tabSpec); + notifyDataSetChanged(); + } + + @Override + public int getCount() { + return mTabs.size(); + } + + @Override + public Object instantiateItem(ViewGroup container, int position) { + View view = mTabs.get(position).view; + container.addView(view); + return view; + } + + @Override + public void destroyItem(ViewGroup container, int position, Object object) { + container.removeView((View)object); + } + + @Override + public boolean isViewFromObject(View view, Object object) { + return view == object; + } + + @Override + public void onTabChanged(String tabId) { + int position = mTabHost.getCurrentTab(); + mViewPager.setCurrentItem(position); + } + + @Override + public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + } + + @Override + public void onPageSelected(int position) { + // Unfortunately when TabHost changes the current tab, it kindly + // also takes care of putting focus on it when not in touch mode. + // The jerk. + // This hack tries to prevent this from pulling focus out of our + // ViewPager. + TabWidget widget = mTabHost.getTabWidget(); + int oldFocusability = widget.getDescendantFocusability(); + widget.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS); + mTabHost.setCurrentTab(position); + widget.setDescendantFocusability(oldFocusability); + + // Scroll the current tab into visibility if needed. + View tab = widget.getChildTabViewAt(position); + mTempRect.set(tab.getLeft(), tab.getTop(), tab.getRight(), tab.getBottom()); + widget.requestRectangleOnScreen(mTempRect, false); + + // Make sure the scrollbars are visible for a moment after selection + final View contentView = mTabs.get(position).view; + if (contentView instanceof CaffeinatedScrollView) { + ((CaffeinatedScrollView) contentView).awakenScrollBars(); + } + } + + @Override + public void onPageScrollStateChanged(int state) { + } +} |