references/openproject
1
0
Fork 0
mirror of https://github.com/opf/openproject.git synced 2026-06-14 03:30:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23284 from opf/bug/75032-imprecise-error-for-ssl-errors-when-testing-jira-connection

Browse Source 
[#75032] Imprecise error for SSL errors when testing Jira connection
This commit is contained in:
Andrej
2026-05-20 15:22:19 +02:00
committed by GitHub
parent 2b745de2ac acffeb9989
commit 4a6903f14f
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/admin/import/jira/instances_controller.rb
+1 -1
View File
@@ -134,7 +134,7 @@ module Admin::Import::Jira
when Import::JiraClient::ApiError then t(:"admin.jira.test.api_error", status: error.status)
else
Rails.logger.error("Unexpected error testing Jira configuration: #{error.class} - #{error.message}")
t(:"admin.jira.test.error")
"#{t(:"admin.jira.test.error")}: #{error.message}"
end
render_error_flash_message_via_turbo_stream(message:)
end
app/services/import/jira_client.rb
+4
View File
@@ -264,6 +264,8 @@ module Import
nil
rescue SsrfFilter::Error => e
raise ConnectionError, I18n.t("admin.jira.client.connection_error", message: e.message)
rescue OpenSSL::SSL::SSLError => e
raise ConnectionError, I18n.t("admin.jira.client.ssl_error", message: e.message)
rescue Timeout::Error => e
raise ConnectionError, I18n.t("admin.jira.client.connection_timeout", message: e.message)
ensure
@@ -286,6 +288,8 @@ module Import
)
rescue SsrfFilter::Error, SocketError, Errno::ECONNREFUSED, Errno::EHOSTUNREACH => e
raise ConnectionError, I18n.t("admin.jira.client.connection_error", message: e.message)
rescue OpenSSL::SSL::SSLError => e
raise ConnectionError, I18n.t("admin.jira.client.ssl_error", message: e.message)
rescue Timeout::Error => e
raise ConnectionError, I18n.t("admin.jira.client.connection_timeout", message: e.message)
end
config/locales/en.yml
+1
View File
@@ -163,6 +163,7 @@ en:
client:
connection_error: "Failed to connect to Jira server: %{message}"
connection_timeout: "Connection to Jira server timed out: %{message}"
ssl_error: "SSL error connecting to Jira server: %{message}"
parse_error: "Failed to parse Jira API response: %{message}"
api_error: "Jira API returned error status %{status}"
401_error: "Jira API returned a 401 error. Your authentication token may have expired or lack the required permissions. Please ensure the token belongs to a Jira administrator."