F43 (#460)

* make build for fedora 43

* fix missing icon on f43

* handle auth token format change

* bump version

* update changelogs

* update runners lol

* update webkit2gtk in runners

* update go version, use preinstalled awscli

* update coverage action

* remove regex test case

Author: jstaf

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.14.1
+current_version = 0.15.0
 commit = False
 tag = False
 

.github/workflows/ci.yml

@@ -3,7 +3,7 @@ on: push
 jobs:
   test:
     name: Run tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -16,22 +16,20 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.19"
+          go-version: "1.25"
 
       - name: Install apt dependencies
         run: |
           sudo apt update
           sudo apt install \
             gcc \
             pkg-config \
-            libwebkit2gtk-4.0-dev \
+            libwebkit2gtk-4.1-dev \
             libjson-glib-dev \
             make \
             wget \
             rpm \
-            awscli \
             libreoffice
-          sudo rm /usr/local/bin/aws  # whyyy
 
       - uses: actions/cache@v4
         with:
@@ -73,8 +71,8 @@ jobs:
 
       - name: Copy new auth tokens to S3
         run: |
-          /usr/bin/aws s3 cp .auth_tokens.json s3://fusefs-travis/$ACCOUNT_TYPE/
-          /usr/bin/aws s3 cp fusefs_tests.log s3://fusefs-travis/$ACCOUNT_TYPE/
+          aws s3 cp .auth_tokens.json s3://fusefs-travis/$ACCOUNT_TYPE/
+          aws s3 cp fusefs_tests.log s3://fusefs-travis/$ACCOUNT_TYPE/
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -88,7 +86,7 @@ jobs:
         if: always()
 
       - name: Convert coverage to lcov
-        uses: jandelgado/gcov2lcov-action@v1.0.5
+        uses: jandelgado/gcov2lcov-action@v1.2.0
         if: always()
 
       - name: Send test coverage to Coveralls
@@ -105,7 +103,7 @@ jobs:
     name: Complete Coveralls run
     needs: test
     if: always()
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Coveralls finished
         uses: coverallsapp/github-action@v2

README.md

@@ -170,11 +170,11 @@ journalctl --user -u $SERVICE_NAME --since today
 ## Building onedriver yourself
 
 In addition to the traditional [Go tooling](https://golang.org/dl/), you will
-need a C compiler and development headers for `webkit2gtk-4.0` and `json-glib`.
+need a C compiler and development headers for `webkit2gtk-4.1` and `json-glib`.
 On Fedora, these can be obtained with
-`dnf install golang gcc pkg-config webkit2gtk3-devel json-glib-devel`. On
+`dnf install golang gcc pkg-config webkit2gtk4.1-devel json-glib-devel`. On
 Ubuntu, these dependencies can be installed with
-`apt install golang gcc pkg-config libwebkit2gtk-4.0-dev libjson-glib-dev`.
+`apt install golang gcc pkg-config libwebkit2gtk-4.1-dev libjson-glib-dev`.
 
 ```bash
 # to build and run the binary

cgo-helper.sh

@@ -7,9 +7,7 @@ if [ -n "$CGO_ENABLED" ] && [ "$CGO_ENABLED" -eq 0 ]; then
     exit 0
 fi
 
-if pkg-config webkit2gtk-4.0; then
-    sed -i 's/webkit2gtk-4.1/webkit2gtk-4.0/g' fs/graph/oauth2_gtk.go
-elif ! pkg-config webkit2gtk-4.1; then
+if ! pkg-config webkit2gtk-4.1; then
     echo "webkit2gtk development headers must be installed"
     exit 1
 fi

cmd/common/common.go

@@ -12,7 +12,7 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-const version = "0.14.1"
+const version = "0.15.0"
 
 var commit string
 

cmd/onedriver-launcher/main.go

@@ -304,7 +304,7 @@ func newMountRow(config common.Config, mount string) (*gtk.ListBoxRow, *gtk.Swit
 	})
 
 	mountpointSettingsBtn, _ := gtk.MenuButtonNew()
-	icon, _ := gtk.ImageNewFromIconName("emblem-system-symbolic", gtk.ICON_SIZE_BUTTON)
+	icon, _ := gtk.ImageNewFromIconName("applications-system-symbolic", gtk.ICON_SIZE_BUTTON)
 	mountpointSettingsBtn.SetImage(icon)
 	popover, _ := gtk.PopoverNew(mountpointSettingsBtn)
 	mountpointSettingsBtn.SetPopover(popover)

fs/graph/oauth2.go

@@ -2,13 +2,11 @@ package graph
 
 import (
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"os"
-	"regexp"
 	"strings"
 	"time"
 
@@ -158,13 +156,13 @@ func getAuthCodeHeadless(a AuthConfig, accountName string) string {
 
 // parseAuthCode is used to parse the auth code out of the redirect the server gives us
 // after successful authentication
-func parseAuthCode(url string) (string, error) {
-	rexp := regexp.MustCompile("code=([a-zA-Z0-9-_.])+")
-	code := rexp.FindString(url)
-	if len(code) == 0 {
-		return "", errors.New("invalid auth code")
+func parseAuthCode(authURL string) (string, error) {
+	parsed, err := url.Parse(authURL)
+	if err != nil {
+		return "", err
 	}
-	return code[5:], nil
+	params := parsed.Query()
+	return params.Get("code"), nil
 }
 
 // Exchange an auth code for a set of access tokens (returned as a new Auth struct).

fs/graph/oauth2_test.go

@@ -9,16 +9,10 @@ import (
 )
 
 func TestAuthCodeFormat(t *testing.T) {
-	// arbitrary regext test
-	code, err := parseAuthCode("codecode=asd-965198osATYjfb._knlwoieurow*sdjf")
-	assert.NoError(t, err)
-	assert.Equal(t, "asd-965198osATYjfb._knlwoieurow", code,
-		"Auth code parser did not succeed against arbitrary character test.")
-
 	// faked personal auth code
-	code, err = parseAuthCode("https://login.live.com/oauth20_desktop.srf?code=M.R3_BAY.abcd526-817f-d8e9-590c-1227b45c7be2&lc=4105")
+	code, err := parseAuthCode("https://login.live.com/oauth20_desktop.srf?code=M.R3_BAY.abcd526-817f-*!$d8e9-590c-1227b45c7be2&lc=4105")
 	assert.NoError(t, err)
-	assert.Equal(t, "M.R3_BAY.abcd526-817f-d8e9-590c-1227b45c7be2", code,
+	assert.Equal(t, "M.R3_BAY.abcd526-817f-*!$d8e9-590c-1227b45c7be2", code,
 		"Personal auth code did not match expected result.")
 
 	// faked business auth code

onedriver.spec

@@ -1,5 +1,5 @@
 Name:          onedriver
-Version:       0.14.1
+Version:       0.15.0
 Release:       1%{?dist}
 Summary:       A native Linux filesystem for Microsoft Onedrive
 
@@ -15,7 +15,7 @@ BuildRequires: golang >= 1.17.0
 BuildRequires: git
 BuildRequires: gcc
 BuildRequires: pkg-config
-BuildRequires: webkit2gtk3-devel
+BuildRequires: webkit2gtk4.1-devel
 Requires: fuse3
 
 %description
@@ -71,6 +71,12 @@ cp pkg/resources/%{name}.1.gz %{buildroot}/usr/share/man/man1
 %attr(644, root, root) /usr/share/man/man1/%{name}.1.gz
 
 %changelog
+* Fri Jan 30 2026 Jeff Stafford <jeff.stafford@protonmail.com> - 0.15.0
+- Slight refresh of the onedriver UI to look nicer.
+- Fix an authentication bug (Microsoft changed the auth format and I was using a
+  regex to parse the token when I shouldn't have been).
+- Update to webkit2gtk-4.1 (what all major distros are using now).
+
 * Wed Oct 18 2023 Jeff Stafford <jeff.stafford@protonmail.com> - 0.14.1
 - Fixes a bug with file corruption in some scenarios from version 0.14.0.
 

pkg/debian/changelog

@@ -1,3 +1,12 @@
+onedriver (0.15.0-1) noble; urgency=low
+
+  * Slight refresh of the onedriver UI to look nicer.
+  * Fix an authentication bug (Microsoft changed the auth format and I was
+    using a regex to parse the token when I shouldn't have been).
+  * Update to webkit2gtk-4.1 (what all distros are using now).
+ 
+ -- Jeff Stafford <jeff.stafford@protonmail.com> Fri, 30 Jan 2026 15:30:00 -0800
+
 onedriver (0.14.1-1) jammy; urgency=low
 
   * Fixes a bug with file corruption in some scenarios from version 0.14.0.