fergalmoran/chrometophone
1
0
Fork 0
mirror of https://github.com/fergalmoran/chrometophone.git synced 2025-12-25 03:04:38 +00:00
Code Issues 265 Packages Projects Releases Wiki Activity

XSRF header for register/unregister.

Browse Source 
Tight maps URL regex.
This commit is contained in:
burke.davey
2010-07-19 00:22:44 +00:00
parent b1c50187d4
commit c20abe1dc3
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.google.android.apps.chrometophone" package="com.google.android.apps.chrometophone"
android:versionCode="1" android:versionCode="3"
android:versionName="1.0"> android:versionName="1.2">
<!-- Only this application can receive the messages and registration result --> <!-- Only this application can receive the messages and registration result -->
<permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" /> <uses-permission android:name="com.google.android.apps.chrometophone.permission.C2D_MESSAGE" />

12
android/src/com/google/android/apps/chrometophone/C2DMReceiver.java
View File

@@ -38,7 +38,6 @@ import android.text.ClipboardManager;
import com.google.android.c2dm.C2DMBaseReceiver; import com.google.android.c2dm.C2DMBaseReceiver;
public class C2DMReceiver extends C2DMBaseReceiver { public class C2DMReceiver extends C2DMBaseReceiver {
public C2DMReceiver() { public C2DMReceiver() {
super(DeviceRegistrar.SENDER_ID); super(DeviceRegistrar.SENDER_ID);
} }
@@ -119,12 +118,10 @@ public class C2DMReceiver extends C2DMBaseReceiver {
} else { } else {
final String GMM_PACKAGE_NAME = "com.google.android.apps.maps"; final String GMM_PACKAGE_NAME = "com.google.android.apps.maps";
final String GMM_CLASS_NAME = "com.google.android.maps.MapsActivity"; final String GMM_CLASS_NAME = "com.google.android.maps.MapsActivity";
boolean isMapsURL = url.startsWith("http://maps.google.") ||
url.matches("^http://www\\.google\\.[a-z\\.]+/maps");
intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
if (isMapsURL) { if (isMapsURL(url)) {
intent.setClassName(GMM_PACKAGE_NAME, GMM_CLASS_NAME); intent.setClassName(GMM_PACKAGE_NAME, GMM_CLASS_NAME);
} }
@@ -170,10 +167,15 @@ public class C2DMReceiver extends C2DMBaseReceiver {
private String parseTelephoneNumber(String sel) { private String parseTelephoneNumber(String sel) {
String number = null; String number = null;
if (sel != null && sel.matches("^([Tt]el[:]?)?\\s?[+]?(\\(?[0-9|\\s|-]\\)?)+$")) { if (sel != null && sel.matches("([Tt]el[:]?)?\\s?[+]?(\\(?[0-9|\\s|-]\\)?)+")) {
String elements[] = sel.split("([Tt]el[:]?)"); String elements[] = sel.split("([Tt]el[:]?)");
number = elements.length > 1 ? elements[1] : elements[0]; number = elements.length > 1 ? elements[1] : elements[0];
} }
return number; return number;
} }
private boolean isMapsURL(String url) {
return url.matches("http://maps\\.google\\.[a-z]{2,3}(\\.[a-z]{2})?[/?].*") ||
url.matches("http://www\\.google\\.[a-z]{2,3}(\\.[a-z]{2})?/maps.*");
}
} }

3
android/src/com/google/android/apps/chrometophone/DeviceRegistrar.java
View File

@@ -171,12 +171,11 @@ public class DeviceRegistrar {
HttpPost post = new HttpPost(uri); HttpPost post = new HttpPost(uri);
List<NameValuePair> formparams = new ArrayList<NameValuePair>(); List<NameValuePair> formparams = new ArrayList<NameValuePair>();
formparams.add(new BasicNameValuePair("devregid", deviceRegistrationID)); formparams.add(new BasicNameValuePair("devregid", deviceRegistrationID));
// XSRF - needs to be verified by server.
formparams.add(new BasicNameValuePair("token", ascidCookie));
UrlEncodedFormEntity entity = UrlEncodedFormEntity entity =
new UrlEncodedFormEntity(formparams, "UTF-8"); new UrlEncodedFormEntity(formparams, "UTF-8");
post.setEntity(entity); post.setEntity(entity);
post.setHeader("Cookie", ascidCookie); post.setHeader("Cookie", ascidCookie);
post.setHeader("X-Same-Domain", "1"); // XSRF
res = client.execute(post); res = client.execute(post);
return res; return res;
} }