Merge pull request #80 from strykeforce/ipaddresses

Redo Link config for better client IP address checks

Author: jhh

admin/deadeye/__init__.py

@@ -1 +1 @@
-__version__ = "21.2.0"  # updated by scripts/bump.py
+__version__ = "21.3.0"  # updated by scripts/bump.py

admin/pyproject.toml

@@ -3,7 +3,7 @@ authors = ["Jeff Hutchison <[email protected]>"]
 description = "Deadeye admin console back-end"
 license = "MIT"
 name = "deadeye"
-version = "21.2.0"  # updated by scripts/bump.py
+version = "21.3.0"  # updated by scripts/bump.py
 
 [tool.poetry.scripts]
 deadeye = "deadeye.scripts.cli:main"

ansible/roles/deadeye/vars/main.yaml

@@ -1,5 +1,5 @@
 ---
-deadeye_version: 21.2.0 # updated by scripts/bump.py
+deadeye_version: 21.3.0 # updated by scripts/bump.py
 deadeye_repo: https://github.com/strykeforce/deadeye.git
 deadeye_src: /opt/deadeye/src
 deadeye_conf_dir: /etc/opt/deadeye

client/build.gradle.kts

@@ -1,36 +1,38 @@
 plugins {
-    `idea`
+    idea
     `java-library`
     `maven-publish`
 }
 
 group = "org.strykeforce"
-version = "21.2.0" // updated by scripts/bump.py
+version = "21.3.0" // updated by scripts/bump.py
 
 repositories {
     jcenter()
     maven(url = "https://frcmaven.wpi.edu/artifactory/release/")
+    mavenCentral()
 }
 
 dependencies {
     val wpiVersion = "2021.3.1"
-    val slf4jVersion = "1.7.30"
-    val junitVersion = "5.7.2"
+    val slf4jVersion = "1.7.32"
+    val junitVersion = "5.8.1"
     // This dependency is used internally, and not exposed to consumers on their own compile classpath.
-    implementation("com.squareup.moshi:moshi:1.11.0")
+    implementation("com.squareup.moshi:moshi:1.12.0")
     implementation("edu.wpi.first.ntcore:ntcore-java:$wpiVersion")
     implementation("org.slf4j:slf4j-api:$slf4jVersion")
-    implementation("org.jetbrains:annotations:20.1.0")
+    implementation("org.jetbrains:annotations:22.0.0")
 
 
     // Use JUnit Jupiter API for testing.
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitVersion")
+    testImplementation("org.junit.jupiter:junit-jupiter-params:$junitVersion")
 
     // Use JUnit Jupiter Engine for testing.
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitVersion")
     testRuntimeOnly("edu.wpi.first.ntcore:ntcore-jni:$wpiVersion:osxx86-64")
     testRuntimeOnly("edu.wpi.first.wpiutil:wpiutil-java:$wpiVersion")
-    testRuntimeOnly("org.slf4j:slf4j-nop:$slf4jVersion")
+    testRuntimeOnly("ch.qos.logback:logback-classic:1.2.6")
 }
 
 java {

client/src/main/java/org/strykeforce/deadeye/Deadeye.java

@@ -4,17 +4,16 @@
 import com.squareup.moshi.Moshi;
 import edu.wpi.first.networktables.NetworkTable;
 import edu.wpi.first.networktables.NetworkTableInstance;
-import okio.BufferedSource;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.IOException;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;
 import java.util.regex.Pattern;
+import okio.BufferedSource;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Represents a connection to a Deadeye camera. It provides methods to configure and control the
@@ -34,30 +33,58 @@ public class Deadeye<T extends TargetData> {
   /**
    * Initialize a connection to a Deadeye camera.
    *
-   * @param id the camera id.
+   * @param id  the camera id.
    * @param cls the appropriate TargetData (or subclass) class object
    */
   public Deadeye(String id, Class<T> cls) {
-    this(id, cls, NetworkTableInstance.getDefault());
+    this(id, cls, NetworkTableInstance.getDefault(), null);
+  }
+
+  /**
+   * Initialize a connection to a Deadeye camera and override the detected client IP address.
+   *
+   * @param id          the camera id.
+   * @param cls         the appropriate TargetData (or subclass) class object
+   * @param linkAddress override IP address to send client data to
+   */
+  public Deadeye(String id, Class<T> cls, @Nullable String linkAddress) {
+    this(id, cls, NetworkTableInstance.getDefault(), linkAddress);
   }
 
+
   /**
    * Initialize a connection to a Deadeye camera using a specified NetworkTables instance. This is
    * primarily used for testing.
    *
-   * @param id the camera id.
+   * @param id  the camera id.
    * @param cls the appropriate TargetData (or subclass) class object
    * @param nti the NetworkTables instance to connect through
    */
-  @SuppressWarnings("unchecked")
   public Deadeye(String id, Class<T> cls, NetworkTableInstance nti) {
+    this(id, cls, nti, null);
+  }
+
+  /**
+   * Initialize a connection to a Deadeye camera using a specified NetworkTables instance and
+   * override the client IP address. This is primarily used for testing.
+   *
+   * @param id          the camera id.
+   * @param cls         the appropriate TargetData (or subclass) class object
+   * @param nti         the NetworkTables instance to connect through
+   * @param linkAddress override IP address to send target data to
+   */
+  @SuppressWarnings("unchecked")
+  public Deadeye(@NotNull String id, @NotNull Class<T> cls, @NotNull NetworkTableInstance nti,
+      @Nullable String linkAddress) {
     if (!Pattern.matches("^[A-Za-z][0-4]$", id)) {
       throw new IllegalArgumentException(id);
     }
 
     if (link == null) {
       synchronized (Link.class) {
-        if (link == null) link = new Link(nti);
+        if (link == null) {
+          link = new Link(nti, linkAddress);
+        }
       }
     }
 
@@ -70,7 +97,9 @@ public Deadeye(String id, Class<T> cls, NetworkTableInstance nti) {
 
     if (!link.isAlive()) {
       synchronized (Link.class) {
-        if (!link.isAlive()) link.start();
+        if (!link.isAlive()) {
+          link.start();
+        }
       }
     }
 
@@ -87,6 +116,11 @@ public Deadeye(String id, Class<T> cls, NetworkTableInstance nti) {
     }
   }
 
+  static JsonAdapter<Info> getInfoJsonAdapter() {
+    Moshi moshi = new Moshi.Builder().build();
+    return moshi.adapter(Info.class);
+  }
+
   /**
    * Get TargetDataListener.
    *
@@ -107,7 +141,9 @@ public void setTargetDataListener(TargetDataListener<T> targetDataListener) {
 
   public void handleTargetData(BufferedSource source) throws IOException {
     targetData = jsonAdapter.fromJson(source);
-    if (targetDataListener != null) targetDataListener.onTargetData(targetData);
+    if (targetDataListener != null) {
+      targetDataListener.onTargetData(targetData);
+    }
   }
 
   /**
@@ -135,8 +171,11 @@ public boolean getEnabled() {
    * @param enabled true to turn camera on.
    */
   public void setEnabled(boolean enabled) {
-    if (enabled) table.getEntry("On").setBoolean(true);
-    else table.getEntry("Off").setBoolean(true);
+    if (enabled) {
+      table.getEntry("On").setBoolean(true);
+    } else {
+      table.getEntry("Off").setBoolean(true);
+    }
   }
 
   /**
@@ -157,8 +196,11 @@ public boolean getLightEnabled() {
    */
   public void setLightEnabled(boolean enabled) {
     NetworkTable light = table.getSubTable("Light");
-    if (enabled) light.getEntry("On").setBoolean(true);
-    else light.getEntry("Off").setBoolean(true);
+    if (enabled) {
+      light.getEntry("On").setBoolean(true);
+    } else {
+      light.getEntry("Off").setBoolean(true);
+    }
   }
 
   /**
@@ -189,16 +231,12 @@ public Info getInfo() {
     return info;
   }
 
-  static JsonAdapter<Info> getInfoJsonAdapter() {
-    Moshi moshi = new Moshi.Builder().build();
-    return moshi.adapter(Info.class);
-  }
-
   Link getLink() {
     return link;
   }
 
   static class Info {
+
     private final boolean logging;
     private final String pipeline;
     private final String version;
@@ -211,8 +249,12 @@ public Info(boolean logging, String pipeline, String version) {
 
     @Override
     public boolean equals(Object o) {
-      if (this == o) return true;
-      if (o == null || getClass() != o.getClass()) return false;
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
       Info info = (Info) o;
       return logging == info.logging
           && pipeline.equals(info.pipeline)