Merge pull request #87 from norkator/ipm-cleartext-communication-support

IPM cleartext communication support

Author: norkator

app/build.gradle

@@ -10,8 +10,8 @@ android {
         minSdkVersion 22
         targetSdkVersion 30
 
-        versionCode 50
-        versionName "1.18.1" // Use Semver
+        versionCode 51
+        versionName "1.19.0" // Use Semver
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/logo"
         android:label="@string/app_name"
+        android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/logo_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"

app/src/main/java/com/nitramite/apcupsdmonitor/ConnectorTask.java

@@ -174,7 +174,7 @@ ups.UPS_SERVER_ADDRESS, portStringToInteger(ups.UPS_SERVER_PORT),
                 case ConnectionType.UPS_CONNECTION_TYPE_IPM:
                     // Eaton IPM
                     IPM ipm = new IPM(
-                            true, ups.UPS_SERVER_ADDRESS, ups.UPS_SERVER_PORT,
+                            ups.UPS_USE_HTTPS, ups.UPS_SERVER_ADDRESS, ups.UPS_SERVER_PORT,
                             ups.UPS_SERVER_USERNAME, ups.UPS_SERVER_PASSWORD, ups.UPS_NODE_ID
                     );
                     ContentValues contentValues = new ContentValues();

app/src/main/java/com/nitramite/apcupsdmonitor/DatabaseHelper.java

@@ -25,13 +25,14 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     private boolean upgrade = false;
 
     // DATABASE VERSION
-    private static final int DATABASE_VERSION = 6;
+    private static final int DATABASE_VERSION = 7;
     // 1 = v1.1.5
     // 2 = v1.2.2, added ups load events boolean
     // 3 = v1.8.7, added ups_reachable boolean
     // 4 = v1.12.0, contributor bo0tzz added is_apc_nmc field
     // 5 = v1.15.0, added ups_node_id field for Eaton IPM use
     // 6 = v1.18.0, added ups_enabled to disable ups if needed
+    // 7 = v1.19.0, added ups_use_https for http / https toggling cases
 
 
     // DATABASE NAME
@@ -65,6 +66,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
     static final String UPS_IS_APC_NMC = "is_apc_nmc";
     static final String UPS_NODE_ID = "ups_node_id"; // string node id
     static final String UPS_ENABLED = "ups_enabled";
+    static final String UPS_USE_HTTPS = "ups_use_https";
 
     // -------------------------------------------------------------------
 
@@ -99,7 +101,8 @@ public void onCreate(SQLiteDatabase db) {
         db.execSQL("CREATE TABLE IF NOT EXISTS " + UPS_TABLE + "(id INTEGER PRIMARY KEY AUTOINCREMENT, ups_connection_type TEXT, server_address TEXT, server_port TEXT, server_username TEXT, " +
                 "server_password TEXT, server_use_private_key_auth TEXT, server_private_key_password TEXT, server_private_key_path TEXT, server_strict_host_key_checking TEXT, " +
                 "server_status_command TEXT, server_events_location TEXT, server_host_name TEXT, server_host_finger_print TEXT, server_host_key TEXT, " +
-                "ups_status_str TEXT, ups_load_events TEXT, ups_reachable TEXT, is_apc_nmc INTEGER, ups_node_id TEXT, ups_enabled INTEGER DEFAULT 1)");
+                "ups_status_str TEXT, ups_load_events TEXT, ups_reachable TEXT, is_apc_nmc INTEGER, ups_node_id TEXT, ups_enabled INTEGER DEFAULT 1, " +
+                "ups_use_https INTEGER DEFAULT 1)");
 
         // Create events data table
         db.execSQL("CREATE TABLE IF NOT EXISTS " + EVENTS_TABLE + "(id INTEGER PRIMARY KEY AUTOINCREMENT, ups_id TEXT, event_str TEXT)");
@@ -197,6 +200,7 @@ ArrayList<UPS> getAllUps(String upsId, boolean connectorTask) {
             ups.UPS_IS_APC_NMC = res.getInt(18) != 0;
             ups.UPS_NODE_ID = res.getString(19);
             ups.UPS_ENABLED = res.getInt(20) == 1;
+            ups.UPS_USE_HTTPS = res.getInt(21) == 1;
             upsArrayList.add(ups);
         }
         res.close();

app/src/main/java/com/nitramite/apcupsdmonitor/IPM.java

@@ -1,7 +1,6 @@
 package com.nitramite.apcupsdmonitor;
 
 import android.annotation.SuppressLint;
-import android.content.Context;
 import android.util.Log;
 
 import org.json.JSONArray;

app/src/main/java/com/nitramite/apcupsdmonitor/UPS.java

@@ -34,6 +34,7 @@ public class UPS {
     public boolean UPS_IS_APC_NMC = false;
     public String UPS_NODE_ID = null; // IPM this is serial number of your device
     public boolean UPS_ENABLED = true; // cab disable ups momentarily if user wants so
+    public boolean UPS_USE_HTTPS = true;
 
     // Variables | status and event strings
     private String UPS_STATUS_STR = null;

app/src/main/java/com/nitramite/apcupsdmonitor/UpsEditor.java

@@ -49,7 +49,7 @@ public class UpsEditor extends AppCompatActivity {
 
     // View elements
     private EditText privateKeyLocationET;
-    private LinearLayout credentialOptionsLayout, sshOptionsLayout, ipmOptionsLayout;
+    private LinearLayout credentialOptionsLayout, sshOptionsLayout, ipmOptionsLayout, httpHttpsOptionsLayout;
     private RadioButton sshRB;
     private RadioButton nisRB;
     private RadioButton ipmRB;
@@ -88,6 +88,7 @@ protected void onCreate(Bundle savedInstanceState) {
         final EditText eventsLocationET = findViewById(R.id.eventsLocationET);
         final EditText nodeIdET = findViewById(R.id.nodeIdET);
         final Switch upsEnabledSwitch = findViewById(R.id.upsEnabledSwitch);
+        final Switch httpsEnabledSwitch = findViewById(R.id.httpsEnabledSwitch);
 
 
         final Spinner cmdPresetSelection = findViewById(R.id.cmdPresetSelection);
@@ -143,25 +144,29 @@ public void onNothingSelected(AdapterView<?> parent) {
         sshOptionsLayout = findViewById(R.id.sshOptionsLayout);
         credentialOptionsLayout = findViewById(R.id.credentialOptionsLayout);
         ipmOptionsLayout = findViewById(R.id.ipmOptionsLayout);
+        httpHttpsOptionsLayout = findViewById(R.id.httpHttpsOptionsLayout);
 
         sshRB.setOnClickListener(v -> {
             sshOptionsLayout.setVisibility(View.VISIBLE);
             credentialOptionsLayout.setVisibility(View.VISIBLE);
             ipmOptionsLayout.setVisibility(View.GONE);
+            httpHttpsOptionsLayout.setVisibility(View.GONE);
             nisRB.setChecked(false);
             ipmRB.setChecked(false);
         });
         nisRB.setOnClickListener(v -> {
             sshOptionsLayout.setVisibility(View.GONE);
             credentialOptionsLayout.setVisibility(View.GONE);
             ipmOptionsLayout.setVisibility(View.GONE);
+            httpHttpsOptionsLayout.setVisibility(View.GONE);
             sshRB.setChecked(false);
             ipmRB.setChecked(false);
         });
         ipmRB.setOnClickListener(v -> {
             sshOptionsLayout.setVisibility(View.GONE);
             credentialOptionsLayout.setVisibility(View.VISIBLE);
             ipmOptionsLayout.setVisibility(View.VISIBLE);
+            httpHttpsOptionsLayout.setVisibility(View.VISIBLE);
             nisRB.setChecked(false);
             sshRB.setChecked(false);
         });
@@ -222,6 +227,7 @@ public void onNothingSelected(AdapterView<?> parent) {
             loadUpsEventsSwitch.setChecked(ups.getUpsLoadEvents());
             nodeIdET.setText(ups.UPS_NODE_ID);
             upsEnabledSwitch.setChecked(ups.UPS_ENABLED);
+            httpsEnabledSwitch.setChecked(ups.UPS_USE_HTTPS);
         }
 
 
@@ -264,6 +270,7 @@ public void onNothingSelected(AdapterView<?> parent) {
             contentValues.put(DatabaseHelper.UPS_LOAD_EVENTS, loadUpsEventsSwitch.isChecked() ? "1" : "0");
             contentValues.put(DatabaseHelper.UPS_NODE_ID, nodeIdET.getText().toString());
             contentValues.put(DatabaseHelper.UPS_ENABLED, upsEnabledSwitch.isChecked() ? 1 : 0);
+            contentValues.put(DatabaseHelper.UPS_USE_HTTPS, httpsEnabledSwitch.isChecked() ? 1 : 0);
             databaseHelper.insertUpdateUps(null, upsId, contentValues);
             Toast.makeText(UpsEditor.this, R.string.saved, Toast.LENGTH_SHORT).show();
             UpsEditor.this.finish();

app/src/main/res/layout/activity_ups_editor.xml

@@ -128,6 +128,39 @@
                 android:inputType="number" />
 
 
+
+            <LinearLayout
+                android:id="@+id/httpHttpsOptionsLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    android:text="@string/use_https"
+                    android:textSize="18sp" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/http_https_connection_description"
+                    android:textSize="12sp" />
+
+                <Switch
+                    android:id="@+id/httpsEnabledSwitch"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="5dp"
+                    android:singleLine="true"
+                    android:checked="true"
+                    tools:ignore="UseSwitchCompatOrMaterialXml,UseSwitchOrMaterialXml" />
+
+            </LinearLayout>
+
+
+
             <LinearLayout
                 android:id="@+id/credentialOptionsLayout"
                 android:layout_width="match_parent"

app/src/main/res/values-ru/strings.xml

@@ -46,7 +46,7 @@
     <string name="server_address">Адрес сервера</string>
     <string name="server_ip_or_domain_address">IP-адрес сервера или адрес домена</string>
     <string name="server_port">Порт сервера</string>
-    <string name="ssh_default_port_is_22_apcupsd_default_tcp_port_is_3551">Порт SSH по умолчанию - 22. Порт TCP по умолчанию APCUPSD - 3551. Eaton IPM 4680.</string>
+    <string name="ssh_default_port_is_22_apcupsd_default_tcp_port_is_3551">Порт SSH по умолчанию - 22. Порт TCP по умолчанию APCUPSD - 3551. Eaton IPM HTTPS 4680 а также HTTP 4679.</string>
     <string name="port_to_use_for_connection">Порт для подключения</string>
     <string name="server_username_ssh">Имя пользователя сервера (SSH)</string>
     <string name="ssh_server_username">Имя пользователя</string>
@@ -76,6 +76,8 @@
     <string name="private_key_file_imported_failed">Не удалось импортировать файл закрытого ключа.</string>
     <string name="ups_enabled">ИБП Включено</string>
     <string name="ups_enable_toggle_description">ИБП можно на мгновение отключить, если он не подключен. Затем процесс обновления пропустит этот ИБП.</string>
+    <string name="use_https">Использовать HTTPS</string>
+    <string name="http_https_connection_description">HTTPS использует безопасный зашифрованный канал связи, что рекомендуется. Для HTTPS вам понадобится действующий сертификат. Использовать открытый текст HTTP только как последний вариант.</string>
 
     <!-- UpsViewer -->
     <string name="m">M</string>

app/src/main/res/values/strings.xml

@@ -46,7 +46,7 @@
     <string name="server_address">Server address</string>
     <string name="server_ip_or_domain_address">Server ip or domain address</string>
     <string name="server_port">Server port</string>
-    <string name="ssh_default_port_is_22_apcupsd_default_tcp_port_is_3551">SSH default port is 22. APCUPSD default tcp port is 3551. Eaton IPM 4680.</string>
+    <string name="ssh_default_port_is_22_apcupsd_default_tcp_port_is_3551">SSH default port is 22. APCUPSD default tcp port is 3551. Eaton IPM HTTPS 4680 and HTTP 4679.</string>
     <string name="port_to_use_for_connection">Port to use for connection</string>
     <string name="server_username_ssh">Server username</string>
     <string name="ssh_server_username">Server username (SSH, IPM etc)</string>
@@ -76,6 +76,8 @@
     <string name="private_key_file_imported_failed">Failed to import private key file.</string>
     <string name="ups_enabled">UPS Enabled</string>
     <string name="ups_enable_toggle_description">UPS can be disabled momentarily if its not connected. Update process will then skip this UPS.</string>
+    <string name="use_https">Use HTTPS</string>
+    <string name="http_https_connection_description">HTTPS uses secure encrypted communication channel which is recommended way. With HTTPS you will need valid certificate. Use cleartext HTTP only as last option.</string>
 
     <!-- UpsViewer -->
     <string name="m">M</string>

app/src/main/res/xml/network_security_config.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<network-security-config xmlns:tools="http://schemas.android.com/tools">
+    <base-config cleartextTrafficPermitted="true"
+        tools:ignore="InsecureBaseConfiguration" />
+</network-security-config>