From 63ee3a3c01b20668f4276003ba0dc3a95c4b1c45 Mon Sep 17 00:00:00 2001
From: Aleksandr Skoblikov <aleksandr.skoblikov@dbeaver.com>
Date: Fri, 12 Jun 2026 12:17:37 +0400
Subject: [PATCH] dbeaver/pro#3833 fix bug with "null" origin header

---
 .../src/io/cloudbeaver/utils/ServletAppUtils.java             | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/ServletAppUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/ServletAppUtils.java
index 360024ab99..5a1f997bfa 100644
--- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/ServletAppUtils.java
+++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/utils/ServletAppUtils.java
@@ -303,6 +303,10 @@ public static String getOriginFromRequest(@NotNull HttpServletRequest request) {
         if (log.isTraceEnabled()) {
             log.trace("Origin header: " + origin);
         }
+        if ("null".equals(origin)) {
+            //strange identity provider bug
+            origin = null;
+        }
         if (CommonUtils.isEmpty(origin)) {
             origin = request.getHeader(HEADER_X_ORIGIN);
             if (log.isTraceEnabled()) {