Compare commits

..

2 commits

Author SHA1 Message Date
Bastien Nocera
f68c2d96ff Fix D-Bus disconnection when an object path was overly long 2023-07-20 15:42:53 +02:00
Bastien Nocera
e0f7e9b21b Update to 0.1.4 2023-07-19 14:33:07 +02:00
6 changed files with 95 additions and 87 deletions

6
.gitignore vendored
View file

@ -1 +1,5 @@
/xdg-dbus-proxy-*.tar.xz
/xdg-dbus-proxy-0.1.0.tar.xz
/xdg-dbus-proxy-0.1.1.tar.xz
/xdg-dbus-proxy-0.1.2.tar.xz
/xdg-dbus-proxy-0.1.3.tar.xz
/xdg-dbus-proxy-0.1.4.tar.xz

View file

@ -0,0 +1,37 @@
From dea3530414f8d118e64f8ae408eb19f479abc082 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Thu, 20 Jul 2023 14:48:41 +0200
Subject: [PATCH] flatpak-proxy: Fix D-Bus disconnection with overly long
object paths
According to the D-Bus specifications:
https://dbus.freedesktop.org/doc/dbus-specification.html#id-1.4.4
For the STRING and OBJECT_PATH types, [the data length] is encoded in 4
bytes (a UINT32).
But the code was trying to parse the 32-bit integer as an 8-bit one,
meaning that, as was the case with object paths created by the dLeyna
project, a 259-byte long string would be parsed like a 3-byte long
one.
Fixes: 004b7b2ca0e9 ("Parse dbus headers") in flatpak
---
flatpak-proxy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flatpak-proxy.c b/flatpak-proxy.c
index 48781560c8bc..47e51df3df40 100644
--- a/flatpak-proxy.c
+++ b/flatpak-proxy.c
@@ -1116,7 +1116,7 @@ get_signature (Buffer *buffer, guint32 *offset, guint32 end_offset)
static const char *
get_string (Buffer *buffer, Header *header, guint32 *offset, guint32 end_offset)
{
- guint8 len;
+ guint32 len;
char *str;
*offset = align_by_4 (*offset);
--
2.41.0

View file

@ -1,67 +0,0 @@
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Fri Oct 11 2024 David King <amigadave@amigadave.com> - 0.1.6-1
- Update to 0.1.6 (#2307503)
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Aug 07 2023 Kalev Lember <klember@redhat.com> - 0.1.5-1
- Update to 0.1.5 (rhbz#2229713)
* Wed Jul 19 2023 Bastien Nocera <bnocera@redhat.com> - 0.1.4-2
- Fix D-Bus disconnection when an object path was overly long
* Wed Jul 19 2023 Bastien Nocera <bnocera@redhat.com> - 0.1.4-1
- Update to 0.1.4
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 02 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.1.3-1
- Update to 0.1.3
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 0.1.2-1
- Update to 0.1.2
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 15 2019 Kalev Lember <klember@redhat.com> - 0.1.1-1
- Update to 0.1.1
- Build man pages
- Include COPYING file as license
* Fri Nov 23 2018 Kalev Lember <klember@redhat.com> - 0.1.0-1
- Initial Fedora packaging

View file

@ -1,13 +0,0 @@
# Enable/disable monitoring
monitoring = true
# Enable/disable filling bugzilla ticket for new release
# When disabled it will also disable scratch builds
bugzilla = true
# Enable/disable reporting only stable versions
# Stable versions are recognized based on release-monitoring.org project settings
stable_only = false
# Enable/disable reporting all new versions instead of the latest one
# Enabling this will disable scratch builds
all_versions = false
# Enable/disable scratch build for newly opened version
scratch_build = false

View file

@ -1 +1 @@
SHA512 (xdg-dbus-proxy-0.1.8.tar.xz) = 9b0ed1b7cc7133c531b793fe828a103291a46a7de5841aba7f5d728f932570f4a5f82e22fa19576ad812fc344a6c80451c7e414fd66d4ceae8272efe3c8e5901
SHA512 (xdg-dbus-proxy-0.1.4.tar.xz) = d50fa916d07f23e080ab53cf290b5d6db73cfd8262253a48b9f012ce6c182e201d0a67efaeb7f28a844d3ef146aa48936dfbe4279a59b909a6dc4419d5f15b04

View file

@ -1,9 +1,9 @@
Name: xdg-dbus-proxy
Version: 0.1.8
Release: %autorelease
Version: 0.1.4
Release: 2%{?dist}
Summary: Filtering proxy for D-Bus connections
License: LGPL-2.1-or-later
License: LGPLv2+
URL: https://github.com/flatpak/xdg-dbus-proxy/
Source0: https://github.com/flatpak/xdg-dbus-proxy/releases/download/%{version}/%{name}-%{version}.tar.xz
@ -17,6 +17,9 @@ BuildRequires: /usr/bin/xsltproc
Requires: dbus
# https://github.com/flatpak/xdg-dbus-proxy/pull/50
Patch0: 0001-flatpak-proxy-Fix-D-Bus-disconnection-with-overly-lo.patch
%description
xdg-dbus-proxy is a filtering proxy for D-Bus connections. It was originally
part of the flatpak project, but it has been broken out as a standalone module
@ -33,10 +36,54 @@ to facilitate using it in other contexts.
%meson_install
%files
%doc NEWS README.md
%license COPYING
%{_bindir}/xdg-dbus-proxy
%{_mandir}/man1/xdg-dbus-proxy.1*
%changelog
%autochangelog
* Wed Jul 19 2023 Bastien Nocera <bnocera@redhat.com> - 0.1.4-2
- Fix D-Bus disconnection when an object path was overly long
* Wed Jul 19 2023 Bastien Nocera <bnocera@redhat.com> - 0.1.4-1
- Update to 0.1.4
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Mar 02 2022 Debarshi Ray <rishi@fedoraproject.org> - 0.1.3-1
- Update to 0.1.3
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 0.1.2-1
- Update to 0.1.2
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 15 2019 Kalev Lember <klember@redhat.com> - 0.1.1-1
- Update to 0.1.1
- Build man pages
- Include COPYING file as license
* Fri Nov 23 2018 Kalev Lember <klember@redhat.com> - 0.1.0-1
- Initial Fedora packaging