Merge lp:~ev/whoopsie/android-serial into lp:whoopsie

[Evan]

Uses libandroid-properties to use the Android serial number, manufacturer, model, and board as the system identifier (falling back to the first non-loopback MAC address).

Feedback on the selection of hardware-static strings welcome. I'm trying to seed the sha512sum with sufficient data to create a low risk for collision.

[lp:~ev/whoopsie/android-serial]

567. By Evan on 2013-08-02

Use a bit more information on Android to seed the sha512.

568. By Evan on 2013-08-02

Use the board on Android as part of the identitifer.

569. By Evan on 2013-08-02

Typo.

570. By Evan on 2013-08-02

Fix changelog entry.

571. By Evan on 2013-08-02

update the docstring one last time.

[Dimitri John Ledkov (xnox)]

For devices that have sim card capability, they also have IMEI number assigned (world-wide unique across all devices), which is used by SIM cards when authenticating with 3G and GSM networks. It's used to blacklist stolen devices and make them essentially bricks (well, not able to authenticate with 3G/GSM). Thus if available that should be used to uniquely identify the device in-additionto/instead of proposed methods. IMEI is also android independant and portable between all devices that have sim cards (Eg. laptops with sim cards).

Ubuntu System Settings already has methods to fetch IMEI number.

[Evan (ev)]

Following what @xnox said, ubuntu-system-settings uses the QtMobility APIs to fetch the IMEI number. This in turn seems to use NetworkManager's DBus API to find the first GSM device and return its IMEI:

http://www.qt.gitorious.org/qt-mobility/qt-mobility/blobs/master/src/systeminfo/linux/qsysteminfo_linux.cpp#line471

[Evan (ev)]

ofono does provide us with an interface to the IMEI, but it's currently broken in the case when there's no SIM inserted:

https://bugs.launchpad.net/ubuntu/+source/ofono/+bug/1210502

[Evan (ev)]

It's been pointed out by Adam that we probably want to concatenate the IMEI with some other data, like the MAC address, if we are to use it. An IMEI doesn't give you a particularly large range.

[John Lenton (chipaca)]

For the record, this work and ensuing comments was the starting point for https://code.launchpad.net/~chipaca/whoopsie/brofono which has now landed.

[John Lenton (chipaca)]

(setting it to "rejected" because people keep on asking when this branch is going to land...)

Unmerged revisions

571. By Evan on 2013-08-02

update the docstring one last time.

570. By Evan on 2013-08-02

Fix changelog entry.

569. By Evan on 2013-08-02

Typo.

568. By Evan on 2013-08-02

Use the board on Android as part of the identitifer.

567. By Evan on 2013-08-02

Use a bit more information on Android to seed the sha512.

566. By Evan on 2013-08-02

Use the Android serial number for a system identifier, if it is
available.

565. By Evan on 2013-08-02

libandroid-properties-dev build-dep.

564. By Evan on 2013-08-02

Comment.

563. By Evan on 2013-08-02

Once more, without the memory corruption.

562. By Evan on 2013-08-02

Initial commit of work to use the android serial number as the crash db identifier.

=== modified file 'Makefile'
--- Makefile	2013-02-26 10:36:50 +0000
+++ Makefile	2013-08-02 14:44:25 +0000
@@ -7,12 +7,14 @@
 				   $(CFLAGS) $(CPPFLAGS)
 libwhoopsie_LIBS=$(shell pkg-config --libs glib-2.0) \
 				 $(shell libgcrypt-config --libs) \
+				 -landroid-properties \
 				 $(LDFLAGS)
 
 whoopsie_CFLAGS=$(shell pkg-config --cflags gio-2.0 glib-2.0 libcurl) \
 	   -g -Ilib -Wall -Werror -Os -DVERSION=\"$(VERSION)\" \
 	   $(CFLAGS) $(CPPFLAGS)
 whoopsie_LIBS=$(shell pkg-config --libs gio-2.0 glib-2.0 libcurl) -lcap \
+			  -landroid-properties \
 			  $(LDFLAGS)
 SOURCES=src/whoopsie.c \
 		src/utils.c \
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-07-26 15:33:48 +0000
+++ debian/changelog	2013-08-02 14:44:25 +0000
@@ -1,3 +1,10 @@
+whoopsie (0.2.17) UNRELEASED; urgency=low
+
+  * Use the Android serial number, manufacturer, model, and board number to
+    form a system identifier, if they are available.
+
+ -- Evan Dandrea <[e-mail]>  Fri, 02 Aug 2013 15:16:19 +0100
+
 whoopsie (0.2.16) saucy; urgency=low
 
   * Continue to process the existing crash reports every two hours, not
 
=== modified file 'debian/control'
--- debian/control	2013-02-26 10:36:50 +0000
+++ debian/control	2013-08-02 14:44:25 +0000
@@ -9,6 +9,7 @@
  libcap-dev,
  libgtk-3-dev,
  network-manager-dev (>= 0.9.4.0-0ubuntu1),
+ libandroid-properties-dev,
  python,
  valgrind,
  pyflakes
 
=== modified file 'src/identifier.c'
--- src/identifier.c	2013-01-31 14:39:18 +0000
+++ src/identifier.c	2013-08-02 14:44:25 +0000
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE
+
 #include <glib.h>
 #include <gcrypt.h>
 #include <sys/types.h>
@@ -8,6 +10,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <fcntl.h>
+#include <hybris/properties/properties.h>
 
 #include "identifier.h"
 
@@ -29,6 +32,27 @@
 }
 
 void
+whoopsie_identifier_get_android_serial (char** res)
+{
+    /* Use the Android serial number (0000000000000000), manufacturer (Asus),
+     * model (Nexus 7), and board (grouper) for a system identifier. */
+
+    static char serial[PROP_NAME_MAX];
+    static char manufacturer[PROP_NAME_MAX];
+    static char model[PROP_NAME_MAX];
+    static char board[PROP_NAME_MAX];
+
+    property_get("ro.serialno", serial, "");
+
+    if (*serial != '\0') {
+        property_get("ro.product.manufacturer", manufacturer, "");
+        property_get("ro.product.model", model, "");
+        property_get("ro.product.board", board, "");
+        asprintf (res, "%s%s%s%s", serial, manufacturer, model, board);
+    }
+}
+
+void
 whoopsie_identifier_get_mac_address (char** res, GError** error)
 {
     struct ifreq ifr;
@@ -154,6 +178,11 @@
 
     g_return_if_fail (res);
 
+    whoopsie_identifier_get_android_serial (&identifier);
+    if (identifier) {
+        goto out;
+    }
+
     whoopsie_identifier_get_system_uuid (&identifier, error);
     if ((!error || !(*error)) && identifier)
         goto out;