trying ci fix

javakeyring · Sep 24, 2023 · da681b5 · da681b5
1 parent ef30b8c
commit da681b5
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 2 deletions.
diff --git a/.github/workflows/dbus.xml b/.github/workflows/dbus.xml
@@ -0,0 +1,22 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+ <busconfig>
+
+  <!-- Our well-known bus type, do not change this -->
+  <type>system</type>
+
+  <!-- Fork into daemon mode -->
+  <fork/>
+
+  <!-- This is a setuid helper that is used to launch system services -->
+  <servicehelper>/lib/dbus-1/dbus-daemon-launch-helper</servicehelper>
+
+  <!-- Write a pid file -->
+  <pidfile>/tmp/dbus-pid</pidfile>
+
+  <!-- Only listen on a local socket. (abstract=/path/to/socket 
+       means use abstract namespace, don't really create filesystem 
+       file; only Linux supports this. Use path=/whatever on other 
+       systems.) -->
+  <listen>unix:path=/tmp/test_system_bus_socket</listen>
+</busconfig>
diff --git a/.setupkeystore.sh b/.setupkeystore.sh
@@ -3,8 +3,8 @@
 keyring="$1"
 
 set -x
-if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then 
-  export $(dbus-launch)
+if [ "$(expr substr $(uname -s) 1 5)" == "Linux" ] && [ "$keyring" == "gnome" ]; then
+  export $(dbus-launch)   # --config-file=${GITHUB_WORKSPACE}/.github/workflows/dbus.xml)
   eval "$(echo '\n' | gnome-keyring-daemon --unlock)"
   echo xxx@gmail.com | secret-tool store --label="main" email address
   PASS=$(secret-tool lookup email address)

diff --git a/java-keyring/pom.xml b/java-keyring/pom.xml
@@ -24,6 +24,24 @@
         <dependency>
             <groupId>de.swiesend</groupId>
             <artifactId>secret-service</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.github.hypfvieh</groupId>
+                    <artifactId>dbus-java-transport-native-unixsocket</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.hypfvieh</groupId>
+                    <artifactId>dbus-java-core</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.hypfvieh</groupId>
+            <artifactId>dbus-java-transport-jnr-unixsocket</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.github.hypfvieh</groupId>
+            <artifactId>dbus-java-core</artifactId>
         </dependency>
         <dependency>
             <groupId>net.java.dev.jna</groupId>

diff --git a/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java b/java-keyring/src/main/java/com/github/javakeyring/internal/kde/KWalletBackend.java
@@ -43,8 +43,17 @@ public class KWalletBackend implements KeyringBackend {
   private DBusConnection connection;
   private int id = -1;
 
+
   public KWalletBackend() throws BackendNotSupportedException {
     try {
+    //  connection = DBusConnectionBuilder.forAddress(BusAddress.of(System.getProperty("DBUS_TCP_SESSION")))
+    //         .withRegisterSelf(true)
+    //         .withShared(true)
+    //         .transportConfig()
+    //             .withAdditionalConfig("TIMEOUT", 10000)
+    //         .back()
+    //         .build();
+
       connection = DBusConnection.getConnection(DBusConnection.DBusBusType.SESSION);
       wallet = connection.getRemoteObject("org.kde.kwalletd5", "/modules/kwalletd5", KWallet.class, true);
       wallet.localWallet(); //attempt connection to wallet

diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,16 @@
                 <artifactId>jna-platform</artifactId>
                 <version>5.13.0</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.hypfvieh</groupId>
+                <artifactId>dbus-java-transport-jnr-unixsocket</artifactId>
+                <version>4.3.0</version>
+            </dependency>
+            <dependency>
+                <groupId>com.github.hypfvieh</groupId>
+                <artifactId>dbus-java-core</artifactId>
+                <version>4.3.0</version>
+            </dependency>
             <dependency>
                 <groupId>org.ow2.asm</groupId>
                 <artifactId>asm</artifactId>