Loading src/org/microg/gms/auth/loginservice/AccountAuthenticator.java 0 → 100644 +149 −0 Original line number Diff line number Diff line /* * Copyright 2013-2015 µg Project Team * * 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 org.microg.gms.auth.loginservice; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; import android.accounts.NetworkErrorException; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.util.Base64; import android.util.Log; import com.google.android.gms.R; import org.microg.gms.auth.AskPermissionActivity; import org.microg.gms.auth.AuthManager; import org.microg.gms.auth.AuthResponse; import org.microg.gms.auth.login.LoginActivity; import org.microg.gms.common.PackageUtils; import java.util.Arrays; import java.util.List; import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; import static android.accounts.AccountManager.KEY_AUTHTOKEN; import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; import static android.accounts.AccountManager.KEY_CALLER_UID; import static android.accounts.AccountManager.KEY_INTENT; class AccountAuthenticator extends AbstractAccountAuthenticator { private static final String TAG = "GmsAuthenticator"; private Context context; private String accountType; public AccountAuthenticator(Context context) { super(context); this.context = context; accountType = context.getString(R.string.google_account_type); } @Override public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) { Log.d(TAG, "editProperties: " + accountType); return null; } @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { if (accountType.equals(accountType)) { final Intent i = new Intent(context, LoginActivity.class); i.putExtras(options); i.putExtra(LoginActivity.EXTRA_TMPL, LoginActivity.TMPL_NEW_ACCOUNT); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); final Bundle result = new Bundle(); result.putParcelable(KEY_INTENT, i); return result; } return null; } @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) throws NetworkErrorException { Log.d(TAG, "confirmCredentials: " + account + ", " + options); return null; } @Override public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { options.keySet(); Log.d(TAG, "getAuthToken: " + account + ", " + authTokenType + ", " + options); String app = options.getString(KEY_ANDROID_PACKAGE_NAME); PackageUtils.checkPackageUid(context, app, options.getInt(KEY_CALLER_UID), options.getInt(KEY_CALLER_UID)); AuthManager authManager = new AuthManager(context, account.name, app, authTokenType); try { AuthResponse res = authManager.requestAuth(true); if (res.auth != null) { Log.d(TAG, "getAuthToken: " + res.auth); Bundle result = new Bundle(); result.putString(KEY_ACCOUNT_TYPE, account.type); result.putString(KEY_ACCOUNT_NAME, account.name); result.putString(KEY_AUTHTOKEN, res.auth); return result; } else { Bundle result = new Bundle(); Intent i = new Intent(context, AskPermissionActivity.class); i.putExtras(options); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); i.putExtra(KEY_ANDROID_PACKAGE_NAME, app); i.putExtra(KEY_ACCOUNT_TYPE, account.type); i.putExtra(KEY_ACCOUNT_NAME, account.name); i.putExtra(KEY_AUTHTOKEN, authTokenType); if (res.consentDataBase64 != null) i.putExtra(AskPermissionActivity.EXTRA_CONSENT_DATA, Base64.decode(res.consentDataBase64, Base64.DEFAULT)); result.putParcelable(KEY_INTENT, i); return result; } } catch (Exception e) { Log.w(TAG, e); return null; } } @Override public String getAuthTokenLabel(String authTokenType) { Log.d(TAG, "getAuthTokenLabel: " + authTokenType); return null; } @Override public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { Log.d(TAG, "updateCredentials: " + account + ", " + authTokenType + ", " + options); return null; } @Override public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException { Log.d(TAG, "hasFeatures: " + account + ", " + Arrays.toString(features)); AccountManager accountManager = AccountManager.get(context); List<String> services = Arrays.asList(accountManager.getUserData(account, "services").split(",")); boolean res = true; for (String feature : features) { if (feature.startsWith("service_") && !services.contains(feature.substring(8))) res = false; } Bundle result = new Bundle(); result.putBoolean(KEY_BOOLEAN_RESULT, res); return result; } } src/org/microg/gms/auth/loginservice/GoogleLoginService.java +3 −133 Original line number Diff line number Diff line Loading @@ -16,156 +16,26 @@ package org.microg.gms.auth.loginservice; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; import android.accounts.NetworkErrorException; import android.app.Service; import android.content.Intent; import android.os.Bundle; import android.os.IBinder; import android.util.Base64; import android.util.Log; import com.google.android.gms.R; import org.microg.gms.auth.AskPermissionActivity; import org.microg.gms.auth.AuthManager; import org.microg.gms.auth.AuthResponse; import org.microg.gms.auth.login.LoginActivity; import org.microg.gms.common.PackageUtils; import java.util.Arrays; import java.util.List; import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; import static android.accounts.AccountManager.KEY_AUTHTOKEN; import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; import static android.accounts.AccountManager.KEY_CALLER_UID; import static android.accounts.AccountManager.KEY_INTENT; public class GoogleLoginService extends Service { private static final String TAG = "GmsAuthLoginSvc"; private String accountType; private AccountAuthenticator authenticator; @Override public void onCreate() { super.onCreate(); accountType = getString(R.string.google_account_type); authenticator = new AccountAuthenticator(this); } @Override public IBinder onBind(Intent intent) { if (intent.getAction().equals(ACTION_AUTHENTICATOR_INTENT)) { return new AbstractAccountAuthenticator(this) { @Override public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) { Log.d(TAG, "editProperties: " + accountType); return null; } @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { if (accountType.equals(GoogleLoginService.this.accountType)) { return GoogleLoginService.this.addAccount(response, authTokenType, requiredFeatures, options); } return null; } @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) throws NetworkErrorException { Log.d(TAG, "confirmCredentials: " + account + ", " + options); return null; } @Override public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { return GoogleLoginService.this.getAuthToken(response, account, authTokenType, options); } @Override public String getAuthTokenLabel(String authTokenType) { Log.d(TAG, "getAuthTokenLabel: " + authTokenType); return null; } @Override public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { Log.d(TAG, "updateCredentials: " + account + ", " + authTokenType + ", " + options); return null; } @Override public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException { return GoogleLoginService.this.hasFeatures(account, features); } }.getIBinder(); return authenticator.getIBinder(); } return null; } private Bundle hasFeatures(Account account, String[] features) { Log.d(TAG, "hasFeatures: " + account + ", " + Arrays.toString(features)); AccountManager accountManager = AccountManager.get(this); List<String> services = Arrays.asList(accountManager.getUserData(account, "services").split(",")); boolean res = true; for (String feature : features) { if (feature.startsWith("service_") && !services.contains(feature.substring(8))) res = false; } Bundle result = new Bundle(); result.putBoolean(KEY_BOOLEAN_RESULT, res); return result; } private Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) { options.keySet(); Log.d(TAG, "getAuthToken: " + account + ", " + authTokenType + ", " + options); String app = options.getString(KEY_ANDROID_PACKAGE_NAME); PackageUtils.checkPackageUid(this, app, options.getInt(KEY_CALLER_UID), options.getInt(KEY_CALLER_UID)); AuthManager authManager = new AuthManager(this, account.name, app, authTokenType); try { AuthResponse res = authManager.requestAuth(true); if (res.auth != null) { Log.d(TAG, "getAuthToken: " + res.auth); Bundle result = new Bundle(); result.putString(KEY_ACCOUNT_TYPE, account.type); result.putString(KEY_ACCOUNT_NAME, account.name); result.putString(KEY_AUTHTOKEN, res.auth); return result; } else { Bundle result = new Bundle(); Intent i = new Intent(this, AskPermissionActivity.class); i.putExtras(options); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); i.putExtra(KEY_ANDROID_PACKAGE_NAME, app); i.putExtra(KEY_ACCOUNT_TYPE, account.type); i.putExtra(KEY_ACCOUNT_NAME, account.name); i.putExtra(KEY_AUTHTOKEN, authTokenType); if (res.consentDataBase64 != null) i.putExtra(AskPermissionActivity.EXTRA_CONSENT_DATA, Base64.decode(res.consentDataBase64, Base64.DEFAULT)); result.putParcelable(KEY_INTENT, i); return result; } } catch (Exception e) { Log.w(TAG, e); return null; } } private Bundle addAccount(AccountAuthenticatorResponse response, String authTokenType, String[] requiredFeatures, Bundle options) { final Intent i = new Intent(GoogleLoginService.this, LoginActivity.class); i.putExtras(options); i.putExtra(LoginActivity.EXTRA_TMPL, LoginActivity.TMPL_NEW_ACCOUNT); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); final Bundle result = new Bundle(); result.putParcelable(KEY_INTENT, i); return result; } } Loading
src/org/microg/gms/auth/loginservice/AccountAuthenticator.java 0 → 100644 +149 −0 Original line number Diff line number Diff line /* * Copyright 2013-2015 µg Project Team * * 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 org.microg.gms.auth.loginservice; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; import android.accounts.NetworkErrorException; import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.util.Base64; import android.util.Log; import com.google.android.gms.R; import org.microg.gms.auth.AskPermissionActivity; import org.microg.gms.auth.AuthManager; import org.microg.gms.auth.AuthResponse; import org.microg.gms.auth.login.LoginActivity; import org.microg.gms.common.PackageUtils; import java.util.Arrays; import java.util.List; import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; import static android.accounts.AccountManager.KEY_AUTHTOKEN; import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; import static android.accounts.AccountManager.KEY_CALLER_UID; import static android.accounts.AccountManager.KEY_INTENT; class AccountAuthenticator extends AbstractAccountAuthenticator { private static final String TAG = "GmsAuthenticator"; private Context context; private String accountType; public AccountAuthenticator(Context context) { super(context); this.context = context; accountType = context.getString(R.string.google_account_type); } @Override public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) { Log.d(TAG, "editProperties: " + accountType); return null; } @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { if (accountType.equals(accountType)) { final Intent i = new Intent(context, LoginActivity.class); i.putExtras(options); i.putExtra(LoginActivity.EXTRA_TMPL, LoginActivity.TMPL_NEW_ACCOUNT); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); final Bundle result = new Bundle(); result.putParcelable(KEY_INTENT, i); return result; } return null; } @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) throws NetworkErrorException { Log.d(TAG, "confirmCredentials: " + account + ", " + options); return null; } @Override public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { options.keySet(); Log.d(TAG, "getAuthToken: " + account + ", " + authTokenType + ", " + options); String app = options.getString(KEY_ANDROID_PACKAGE_NAME); PackageUtils.checkPackageUid(context, app, options.getInt(KEY_CALLER_UID), options.getInt(KEY_CALLER_UID)); AuthManager authManager = new AuthManager(context, account.name, app, authTokenType); try { AuthResponse res = authManager.requestAuth(true); if (res.auth != null) { Log.d(TAG, "getAuthToken: " + res.auth); Bundle result = new Bundle(); result.putString(KEY_ACCOUNT_TYPE, account.type); result.putString(KEY_ACCOUNT_NAME, account.name); result.putString(KEY_AUTHTOKEN, res.auth); return result; } else { Bundle result = new Bundle(); Intent i = new Intent(context, AskPermissionActivity.class); i.putExtras(options); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); i.putExtra(KEY_ANDROID_PACKAGE_NAME, app); i.putExtra(KEY_ACCOUNT_TYPE, account.type); i.putExtra(KEY_ACCOUNT_NAME, account.name); i.putExtra(KEY_AUTHTOKEN, authTokenType); if (res.consentDataBase64 != null) i.putExtra(AskPermissionActivity.EXTRA_CONSENT_DATA, Base64.decode(res.consentDataBase64, Base64.DEFAULT)); result.putParcelable(KEY_INTENT, i); return result; } } catch (Exception e) { Log.w(TAG, e); return null; } } @Override public String getAuthTokenLabel(String authTokenType) { Log.d(TAG, "getAuthTokenLabel: " + authTokenType); return null; } @Override public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { Log.d(TAG, "updateCredentials: " + account + ", " + authTokenType + ", " + options); return null; } @Override public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException { Log.d(TAG, "hasFeatures: " + account + ", " + Arrays.toString(features)); AccountManager accountManager = AccountManager.get(context); List<String> services = Arrays.asList(accountManager.getUserData(account, "services").split(",")); boolean res = true; for (String feature : features) { if (feature.startsWith("service_") && !services.contains(feature.substring(8))) res = false; } Bundle result = new Bundle(); result.putBoolean(KEY_BOOLEAN_RESULT, res); return result; } }
src/org/microg/gms/auth/loginservice/GoogleLoginService.java +3 −133 Original line number Diff line number Diff line Loading @@ -16,156 +16,26 @@ package org.microg.gms.auth.loginservice; import android.accounts.AbstractAccountAuthenticator; import android.accounts.Account; import android.accounts.AccountAuthenticatorResponse; import android.accounts.AccountManager; import android.accounts.NetworkErrorException; import android.app.Service; import android.content.Intent; import android.os.Bundle; import android.os.IBinder; import android.util.Base64; import android.util.Log; import com.google.android.gms.R; import org.microg.gms.auth.AskPermissionActivity; import org.microg.gms.auth.AuthManager; import org.microg.gms.auth.AuthResponse; import org.microg.gms.auth.login.LoginActivity; import org.microg.gms.common.PackageUtils; import java.util.Arrays; import java.util.List; import static android.accounts.AccountManager.ACTION_AUTHENTICATOR_INTENT; import static android.accounts.AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE; import static android.accounts.AccountManager.KEY_ACCOUNT_NAME; import static android.accounts.AccountManager.KEY_ACCOUNT_TYPE; import static android.accounts.AccountManager.KEY_ANDROID_PACKAGE_NAME; import static android.accounts.AccountManager.KEY_AUTHTOKEN; import static android.accounts.AccountManager.KEY_BOOLEAN_RESULT; import static android.accounts.AccountManager.KEY_CALLER_UID; import static android.accounts.AccountManager.KEY_INTENT; public class GoogleLoginService extends Service { private static final String TAG = "GmsAuthLoginSvc"; private String accountType; private AccountAuthenticator authenticator; @Override public void onCreate() { super.onCreate(); accountType = getString(R.string.google_account_type); authenticator = new AccountAuthenticator(this); } @Override public IBinder onBind(Intent intent) { if (intent.getAction().equals(ACTION_AUTHENTICATOR_INTENT)) { return new AbstractAccountAuthenticator(this) { @Override public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) { Log.d(TAG, "editProperties: " + accountType); return null; } @Override public Bundle addAccount(AccountAuthenticatorResponse response, String accountType, String authTokenType, String[] requiredFeatures, Bundle options) throws NetworkErrorException { if (accountType.equals(GoogleLoginService.this.accountType)) { return GoogleLoginService.this.addAccount(response, authTokenType, requiredFeatures, options); } return null; } @Override public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account, Bundle options) throws NetworkErrorException { Log.d(TAG, "confirmCredentials: " + account + ", " + options); return null; } @Override public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { return GoogleLoginService.this.getAuthToken(response, account, authTokenType, options); } @Override public String getAuthTokenLabel(String authTokenType) { Log.d(TAG, "getAuthTokenLabel: " + authTokenType); return null; } @Override public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) throws NetworkErrorException { Log.d(TAG, "updateCredentials: " + account + ", " + authTokenType + ", " + options); return null; } @Override public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account, String[] features) throws NetworkErrorException { return GoogleLoginService.this.hasFeatures(account, features); } }.getIBinder(); return authenticator.getIBinder(); } return null; } private Bundle hasFeatures(Account account, String[] features) { Log.d(TAG, "hasFeatures: " + account + ", " + Arrays.toString(features)); AccountManager accountManager = AccountManager.get(this); List<String> services = Arrays.asList(accountManager.getUserData(account, "services").split(",")); boolean res = true; for (String feature : features) { if (feature.startsWith("service_") && !services.contains(feature.substring(8))) res = false; } Bundle result = new Bundle(); result.putBoolean(KEY_BOOLEAN_RESULT, res); return result; } private Bundle getAuthToken(AccountAuthenticatorResponse response, Account account, String authTokenType, Bundle options) { options.keySet(); Log.d(TAG, "getAuthToken: " + account + ", " + authTokenType + ", " + options); String app = options.getString(KEY_ANDROID_PACKAGE_NAME); PackageUtils.checkPackageUid(this, app, options.getInt(KEY_CALLER_UID), options.getInt(KEY_CALLER_UID)); AuthManager authManager = new AuthManager(this, account.name, app, authTokenType); try { AuthResponse res = authManager.requestAuth(true); if (res.auth != null) { Log.d(TAG, "getAuthToken: " + res.auth); Bundle result = new Bundle(); result.putString(KEY_ACCOUNT_TYPE, account.type); result.putString(KEY_ACCOUNT_NAME, account.name); result.putString(KEY_AUTHTOKEN, res.auth); return result; } else { Bundle result = new Bundle(); Intent i = new Intent(this, AskPermissionActivity.class); i.putExtras(options); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); i.putExtra(KEY_ANDROID_PACKAGE_NAME, app); i.putExtra(KEY_ACCOUNT_TYPE, account.type); i.putExtra(KEY_ACCOUNT_NAME, account.name); i.putExtra(KEY_AUTHTOKEN, authTokenType); if (res.consentDataBase64 != null) i.putExtra(AskPermissionActivity.EXTRA_CONSENT_DATA, Base64.decode(res.consentDataBase64, Base64.DEFAULT)); result.putParcelable(KEY_INTENT, i); return result; } } catch (Exception e) { Log.w(TAG, e); return null; } } private Bundle addAccount(AccountAuthenticatorResponse response, String authTokenType, String[] requiredFeatures, Bundle options) { final Intent i = new Intent(GoogleLoginService.this, LoginActivity.class); i.putExtras(options); i.putExtra(LoginActivity.EXTRA_TMPL, LoginActivity.TMPL_NEW_ACCOUNT); i.putExtra(KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response); final Bundle result = new Bundle(); result.putParcelable(KEY_INTENT, i); return result; } }