android: Add properties for DNS servers
[strongswan.git] / src / frontends / android / app / src / main / java / org / strongswan / android / data / VpnProfileDataSource.java
index 7154336..48c468e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017 Tobias Brunner
+ * Copyright (C) 2012-2019 Tobias Brunner
  * Copyright (C) 2012 Giuliano Grassi
  * Copyright (C) 2012 Ralf Sager
  * HSR Hochschule fuer Technik Rapperswil
@@ -52,6 +52,10 @@ public class VpnProfileDataSource
        public static final String KEY_SELECTED_APPS = "selected_apps";
        public static final String KEY_SELECTED_APPS_LIST = "selected_apps_list";
        public static final String KEY_NAT_KEEPALIVE = "nat_keepalive";
+       public static final String KEY_FLAGS = "flags";
+       public static final String KEY_IKE_PROPOSAL = "ike_proposal";
+       public static final String KEY_ESP_PROPOSAL = "esp_proposal";
+       public static final String KEY_DNS_SERVERS = "dns_servers";
 
        private DatabaseHelper mDbHelper;
        private SQLiteDatabase mDatabase;
@@ -60,52 +64,73 @@ public class VpnProfileDataSource
        private static final String DATABASE_NAME = "strongswan.db";
        private static final String TABLE_VPNPROFILE = "vpnprofile";
 
-       private static final int DATABASE_VERSION = 13;
+       private static final int DATABASE_VERSION = 17;
 
-       public static final String DATABASE_CREATE =
-                                                       "CREATE TABLE " + TABLE_VPNPROFILE + " (" +
-                                                               KEY_ID + " INTEGER PRIMARY KEY AUTOINCREMENT," +
-                                                               KEY_UUID + " TEXT UNIQUE," +
-                                                               KEY_NAME + " TEXT NOT NULL," +
-                                                               KEY_GATEWAY + " TEXT NOT NULL," +
-                                                               KEY_VPN_TYPE + " TEXT NOT NULL," +
-                                                               KEY_USERNAME + " TEXT," +
-                                                               KEY_PASSWORD + " TEXT," +
-                                                               KEY_CERTIFICATE + " TEXT," +
-                                                               KEY_USER_CERTIFICATE + " TEXT," +
-                                                               KEY_MTU + " INTEGER," +
-                                                               KEY_PORT + " INTEGER," +
-                                                               KEY_SPLIT_TUNNELING + " INTEGER," +
-                                                               KEY_LOCAL_ID + " TEXT," +
-                                                               KEY_REMOTE_ID + " TEXT," +
-                                                               KEY_EXCLUDED_SUBNETS + " TEXT," +
-                                                               KEY_INCLUDED_SUBNETS + " TEXT," +
-                                                               KEY_SELECTED_APPS + " INTEGER," +
-                                                               KEY_SELECTED_APPS_LIST + " TEXT," +
-                                                               KEY_NAT_KEEPALIVE + " INTEGER" +
-                                                       ");";
-       private static final String[] ALL_COLUMNS = new String[] {
-                                                               KEY_ID,
-                                                               KEY_UUID,
-                                                               KEY_NAME,
-                                                               KEY_GATEWAY,
-                                                               KEY_VPN_TYPE,
-                                                               KEY_USERNAME,
-                                                               KEY_PASSWORD,
-                                                               KEY_CERTIFICATE,
-                                                               KEY_USER_CERTIFICATE,
-                                                               KEY_MTU,
-                                                               KEY_PORT,
-                                                               KEY_SPLIT_TUNNELING,
-                                                               KEY_LOCAL_ID,
-                                                               KEY_REMOTE_ID,
-                                                               KEY_EXCLUDED_SUBNETS,
-                                                               KEY_INCLUDED_SUBNETS,
-                                                               KEY_SELECTED_APPS,
-                                                               KEY_SELECTED_APPS_LIST,
-                                                               KEY_NAT_KEEPALIVE,
+       public static final DbColumn[] COLUMNS = new DbColumn[] {
+                                                               new DbColumn(KEY_ID, "INTEGER PRIMARY KEY AUTOINCREMENT", 1),
+                                                               new DbColumn(KEY_UUID, "TEXT UNIQUE", 9),
+                                                               new DbColumn(KEY_NAME, "TEXT NOT NULL", 1),
+                                                               new DbColumn(KEY_GATEWAY, "TEXT NOT NULL", 1),
+                                                               new DbColumn(KEY_VPN_TYPE, "TEXT NOT NULL", 3),
+                                                               new DbColumn(KEY_USERNAME, "TEXT", 1),
+                                                               new DbColumn(KEY_PASSWORD, "TEXT", 1),
+                                                               new DbColumn(KEY_CERTIFICATE, "TEXT", 1),
+                                                               new DbColumn(KEY_USER_CERTIFICATE, "TEXT", 2),
+                                                               new DbColumn(KEY_MTU, "INTEGER", 5),
+                                                               new DbColumn(KEY_PORT, "INTEGER", 5),
+                                                               new DbColumn(KEY_SPLIT_TUNNELING, "INTEGER", 7),
+                                                               new DbColumn(KEY_LOCAL_ID, "TEXT", 8),
+                                                               new DbColumn(KEY_REMOTE_ID, "TEXT", 8),
+                                                               new DbColumn(KEY_EXCLUDED_SUBNETS, "TEXT", 10),
+                                                               new DbColumn(KEY_INCLUDED_SUBNETS, "TEXT", 11),
+                                                               new DbColumn(KEY_SELECTED_APPS, "INTEGER", 12),
+                                                               new DbColumn(KEY_SELECTED_APPS_LIST, "TEXT", 12),
+                                                               new DbColumn(KEY_NAT_KEEPALIVE, "INTEGER", 13),
+                                                               new DbColumn(KEY_FLAGS, "INTEGER", 14),
+                                                               new DbColumn(KEY_IKE_PROPOSAL, "TEXT", 15),
+                                                               new DbColumn(KEY_ESP_PROPOSAL, "TEXT", 15),
+                                                               new DbColumn(KEY_DNS_SERVERS, "TEXT", 17),
                                                        };
 
+       private static final String[] ALL_COLUMNS = getColumns(DATABASE_VERSION);
+
+       private static String getDatabaseCreate(int version)
+       {
+               boolean first = true;
+               StringBuilder create = new StringBuilder("CREATE TABLE ");
+               create.append(TABLE_VPNPROFILE);
+               create.append(" (");
+               for (DbColumn column : COLUMNS)
+               {
+                       if (column.Since <= version)
+                       {
+                               if (!first)
+                               {
+                                       create.append(",");
+                               }
+                               first = false;
+                               create.append(column.Name);
+                               create.append(" ");
+                               create.append(column.Type);
+                       }
+               }
+               create.append(");");
+               return create.toString();
+       }
+
+       private static String[] getColumns(int version)
+       {
+               ArrayList<String> columns = new ArrayList<>();
+               for (DbColumn column : COLUMNS)
+               {
+                       if (column.Since <= version)
+                       {
+                               columns.add(column.Name);
+                       }
+               }
+               return columns.toArray(new String[0]);
+       }
+
        private static class DatabaseHelper extends SQLiteOpenHelper
        {
                public DatabaseHelper(Context context)
@@ -116,7 +141,7 @@ public class VpnProfileDataSource
                @Override
                public void onCreate(SQLiteDatabase database)
                {
-                       database.execSQL(DATABASE_CREATE);
+                       database.execSQL(getDatabaseCreate(DATABASE_VERSION));
                }
 
                @Override
@@ -136,7 +161,7 @@ public class VpnProfileDataSource
                        }
                        if (oldVersion < 4)
                        {       /* remove NOT NULL constraint from username column */
-                               updateColumns(db);
+                               updateColumns(db, 4);
                        }
                        if (oldVersion < 5)
                        {
@@ -164,7 +189,7 @@ public class VpnProfileDataSource
                        {
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_UUID +
                                                   " TEXT;");
-                               updateColumns(db);
+                               updateColumns(db, 9);
                        }
                        if (oldVersion < 10)
                        {
@@ -188,17 +213,54 @@ public class VpnProfileDataSource
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_NAT_KEEPALIVE +
                                                   " INTEGER;");
                        }
+                       if (oldVersion < 14)
+                       {
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_FLAGS +
+                                                  " INTEGER;");
+                       }
+                       if (oldVersion < 15)
+                       {
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_IKE_PROPOSAL +
+                                                  " TEXT;");
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_ESP_PROPOSAL +
+                                                  " TEXT;");
+                       }
+                       if (oldVersion < 16)
+                       {       /* add a UUID to all entries that haven't one yet */
+                               db.beginTransaction();
+                               try
+                               {
+                                       Cursor cursor = db.query(TABLE_VPNPROFILE, ALL_COLUMNS, KEY_UUID + " is NULL", null, null, null, null);
+                                       for (cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext())
+                                       {
+                                               ContentValues values = new ContentValues();
+                                               values.put(KEY_UUID, UUID.randomUUID().toString());
+                                               db.update(TABLE_VPNPROFILE, values, KEY_ID + " = " + cursor.getLong(cursor.getColumnIndex(KEY_ID)), null);
+                                       }
+                                       cursor.close();
+                                       db.setTransactionSuccessful();
+                               }
+                               finally
+                               {
+                                       db.endTransaction();
+                               }
+                       }
+                       if (oldVersion < 17)
+                       {
+                               db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " ADD " + KEY_DNS_SERVERS +
+                                               " TEXT;");
+                       }
                }
 
-               private void updateColumns(SQLiteDatabase db)
+               private void updateColumns(SQLiteDatabase db, int version)
                {
                        db.beginTransaction();
                        try
                        {
                                db.execSQL("ALTER TABLE " + TABLE_VPNPROFILE + " RENAME TO tmp_" + TABLE_VPNPROFILE + ";");
-                               db.execSQL(DATABASE_CREATE);
+                               db.execSQL(getDatabaseCreate(version));
                                StringBuilder insert = new StringBuilder("INSERT INTO " + TABLE_VPNPROFILE + " SELECT ");
-                               SQLiteQueryBuilder.appendColumns(insert, ALL_COLUMNS);
+                               SQLiteQueryBuilder.appendColumns(insert, getColumns(version));
                                db.execSQL(insert.append(" FROM tmp_" + TABLE_VPNPROFILE + ";").toString());
                                db.execSQL("DROP TABLE tmp_" + TABLE_VPNPROFILE + ";");
                                db.setTransactionSuccessful();
@@ -327,6 +389,28 @@ public class VpnProfileDataSource
        }
 
        /**
+        * Get a single VPN profile from the database by its UUID as String.
+        * @param uuid the UUID of the VPN profile as String
+        * @return the profile or null, if not found
+        */
+       public VpnProfile getVpnProfile(String uuid)
+       {
+               try
+               {
+                       if (uuid != null)
+                       {
+                               return getVpnProfile(UUID.fromString(uuid));
+                       }
+                       return null;
+               }
+               catch (IllegalArgumentException e)
+               {
+                       e.printStackTrace();
+                       return null;
+               }
+       }
+
+       /**
         * Get a list of all VPN profiles stored in the database.
         * @return list of VPN profiles
         */
@@ -350,7 +434,7 @@ public class VpnProfileDataSource
        {
                VpnProfile profile = new VpnProfile();
                profile.setId(cursor.getLong(cursor.getColumnIndex(KEY_ID)));
-               profile.setUUID(getUUID(cursor, cursor.getColumnIndex(KEY_UUID)));
+               profile.setUUID(UUID.fromString(cursor.getString(cursor.getColumnIndex(KEY_UUID))));
                profile.setName(cursor.getString(cursor.getColumnIndex(KEY_NAME)));
                profile.setGateway(cursor.getString(cursor.getColumnIndex(KEY_GATEWAY)));
                profile.setVpnType(VpnType.fromIdentifier(cursor.getString(cursor.getColumnIndex(KEY_VPN_TYPE))));
@@ -368,13 +452,17 @@ public class VpnProfileDataSource
                profile.setSelectedAppsHandling(getInt(cursor, cursor.getColumnIndex(KEY_SELECTED_APPS)));
                profile.setSelectedApps(cursor.getString(cursor.getColumnIndex(KEY_SELECTED_APPS_LIST)));
                profile.setNATKeepAlive(getInt(cursor, cursor.getColumnIndex(KEY_NAT_KEEPALIVE)));
+               profile.setFlags(getInt(cursor, cursor.getColumnIndex(KEY_FLAGS)));
+               profile.setIkeProposal(cursor.getString(cursor.getColumnIndex(KEY_IKE_PROPOSAL)));
+               profile.setEspProposal(cursor.getString(cursor.getColumnIndex(KEY_ESP_PROPOSAL)));
+               profile.setDnsServers(cursor.getString(cursor.getColumnIndex(KEY_DNS_SERVERS)));
                return profile;
        }
 
        private ContentValues ContentValuesFromVpnProfile(VpnProfile profile)
        {
                ContentValues values = new ContentValues();
-               values.put(KEY_UUID, profile.getUUID() != null ? profile.getUUID().toString() : null);
+               values.put(KEY_UUID, profile.getUUID().toString());
                values.put(KEY_NAME, profile.getName());
                values.put(KEY_GATEWAY, profile.getGateway());
                values.put(KEY_VPN_TYPE, profile.getVpnType().getIdentifier());
@@ -392,6 +480,10 @@ public class VpnProfileDataSource
                values.put(KEY_SELECTED_APPS, profile.getSelectedAppsHandling().getValue());
                values.put(KEY_SELECTED_APPS_LIST, profile.getSelectedApps());
                values.put(KEY_NAT_KEEPALIVE, profile.getNATKeepAlive());
+               values.put(KEY_FLAGS, profile.getFlags());
+               values.put(KEY_IKE_PROPOSAL, profile.getIkeProposal());
+               values.put(KEY_ESP_PROPOSAL, profile.getEspProposal());
+               values.put(KEY_DNS_SERVERS, profile.getDnsServers());
                return values;
        }
 
@@ -400,15 +492,17 @@ public class VpnProfileDataSource
                return cursor.isNull(columnIndex) ? null : cursor.getInt(columnIndex);
        }
 
-       private UUID getUUID(Cursor cursor, int columnIndex)
+       private static class DbColumn
        {
-               try
-               {
-                       return cursor.isNull(columnIndex) ? null : UUID.fromString(cursor.getString(columnIndex));
-               }
-               catch (Exception e)
+               public final String Name;
+               public final String Type;
+               public final Integer Since;
+
+               public DbColumn(String name, String type, Integer since)
                {
-                       return null;
+                       Name = name;
+                       Type = type;
+                       Since = since;
                }
        }
 }