Improve redirect handling for title retrieval

.dockerignore

@@ -0,0 +1,9 @@
+.git
+.github
+mvnw.cmd
+**/target
+**/.classpath
+**/.project
+**/.settings
+*.iml
+.idea

.github/dependabot.yml

@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/ci.yml

@@ -0,0 +1,49 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - main
+      - master
+  pull_request:
+
+jobs:
+  build:
+    name: Maven build on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17 with JavaFX
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: '17'
+          cache: maven
+          java-package: jdk+fx
+
+      - name: Build and test
+        run: ./mvnw -B -ntp verify
+
+  docker-build:
+    name: Docker image build
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build container image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./Dockerfile
+          push: false

.github/workflows/codeql.yml

@@ -0,0 +1,45 @@
+name: CodeQL
+
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+  schedule:
+    - cron: '0 6 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: ['java']
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up JDK 17 with JavaFX
+        uses: actions/setup-java@v4
+        with:
+          distribution: zulu
+          java-version: '17'
+          cache: maven
+          java-package: jdk+fx
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v3
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

Dockerfile

@@ -0,0 +1,11 @@
+# Build stage
+FROM bellsoft/liberica-openjdk-debian:17 AS build
+WORKDIR /workspace
+COPY . .
+RUN ./mvnw -B -ntp package -DskipTests
+
+# Runtime stage
+FROM bellsoft/liberica-openjre-full-debian:17
+WORKDIR /opt/habitv
+COPY --from=build /workspace/application/habiTv/target/habiTv-*.jar app.jar
+ENTRYPOINT ["java", "-jar", "/opt/habitv/app.jar"]

fwk/framework/src/com/dabi/habitv/framework/plugin/utils/RetrieverUtils.java

@@ -192,18 +192,43 @@ public static byte[] getUrlContentBytes(final String url, final Proxy proxy) {
 		return baos.toByteArray();
 	}
 
-	public static String getTitleByUrl(String url) {
-		try {
-			return Jsoup.connect(url).get().title();
-		} catch (IOException e) {
-			final SyndFeedInput input = new SyndFeedInput();
-			try {
-				final SyndFeed feed = input.build(new XmlReader(getInputStreamFromUrl(url, null)));
-				return feed.getTitle();
-			} catch (IllegalArgumentException | FeedException | IOException e1) {
-				throw new TechnicalException(e);
-			}
-
-		}
-	}
+        public static String getTitleByUrl(String url) {
+                try {
+                        String currentUrl = url;
+                        int redirectCount = 0;
+                        while (redirectCount < 5) {
+                                final org.jsoup.Connection.Response response = Jsoup.connect(currentUrl)
+                                                .userAgent(USER_AGENT)
+                                                .followRedirects(false)
+                                                .ignoreHttpErrors(true)
+                                                .execute();
+
+                                final int statusCode = response.statusCode();
+                                if (statusCode >= 300 && statusCode < 400) {
+                                        final String location = response.header("Location");
+                                        if (location == null) {
+                                                throw new TechnicalException(new IOException(
+                                                                "Redirect without Location header for url " + currentUrl));
+                                        }
+                                        currentUrl = response.url().toURI().resolve(location).toString();
+                                        redirectCount++;
+                                        continue;
+                                }
+
+                                return response.parse().title();
+                        }
+
+                        throw new TechnicalException(
+                                        new IOException("Too many redirects when retrieving title for url " + url));
+                } catch (Exception e) {
+                        final SyndFeedInput input = new SyndFeedInput();
+                        try {
+                                final SyndFeed feed = input.build(new XmlReader(getInputStreamFromUrl(url, null)));
+                                return feed.getTitle();
+                        } catch (IllegalArgumentException | FeedException | IOException e1) {
+                                throw new TechnicalException(e);
+                        }
+
+                }
+        }
 }

fwk/framework/test/com/dabi/habitv/framework/plugin/utils/TestUrl.java

@@ -1,15 +1,69 @@
-package com.dabi.habitv.framework.plugin.utils;
-
-import org.junit.Test;
-
-public class TestUrl {
-
-	@Test
-	public void test() {
-
-		RetrieverUtils.getTitleByUrl("http://www.beinsports.fr");
-		// RetrieverUtils.getTitleByUrl("http%3A%2F%2Fwww.beinsports.fr%2Fvideos%2Ftitle%2FLiga%20%3A%20Barcelone%204-0%20Almeria%2Farticle%2F3kgv5a6r3li41xod5wm0znvz5");
-		// RetrieverUtils.getTitleByUrl("http://www.beinsports.fr/videos/title/Liga : Barcelone 4-0 Almeria/article/3kgv5a6r3li41xod5wm0znvz5");
-	}
-
-}
+package com.dabi.habitv.framework.plugin.utils;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.InetSocketAddress;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sun.net.httpserver.Headers;
+import com.sun.net.httpserver.HttpExchange;
+import com.sun.net.httpserver.HttpHandler;
+import com.sun.net.httpserver.HttpServer;
+
+public class TestUrl {
+
+        private static final String FINAL_TITLE = "Redirect Target";
+
+        private HttpServer server;
+
+        @Before
+        public void setUp() throws IOException {
+                server = HttpServer.create(new InetSocketAddress(0), 0);
+                server.createContext("/start", new RedirectHandler());
+                server.createContext("/final", new FinalHandler());
+                server.start();
+        }
+
+        @After
+        public void tearDown() {
+                if (server != null) {
+                        server.stop(0);
+                }
+        }
+
+        @Test
+        public void shouldFollowRedirectsWhenRetrievingTitle() {
+                final String url = "http://localhost:" + server.getAddress().getPort() + "/start";
+
+                final String title = RetrieverUtils.getTitleByUrl(url);
+
+                assertEquals(FINAL_TITLE, title);
+        }
+
+        private static class RedirectHandler implements HttpHandler {
+                @Override
+                public void handle(HttpExchange exchange) throws IOException {
+                        final Headers responseHeaders = exchange.getResponseHeaders();
+                        responseHeaders.add("Location", "/final");
+                        exchange.sendResponseHeaders(307, -1);
+                        exchange.close();
+                }
+        }
+
+        private static class FinalHandler implements HttpHandler {
+                @Override
+                public void handle(HttpExchange exchange) throws IOException {
+                        final byte[] response = ("<html><head><title>" + FINAL_TITLE + "</title></head><body></body></html>")
+                                        .getBytes();
+                        exchange.sendResponseHeaders(200, response.length);
+                        try (OutputStream os = exchange.getResponseBody()) {
+                                os.write(response);
+                        }
+                }
+        }
+}

renovate.json

@@ -0,0 +1,11 @@
+{
+  "extends": ["config:base"],
+  "labels": ["dependencies"],
+  "dependencyDashboard": true,
+  "packageRules": [
+    {
+      "matchManagers": ["maven", "github-actions", "docker"],
+      "groupName": "all-dependencies"
+    }
+  ]
+}