summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Bícha <[email protected]>2024-03-27 17:23:52 -0400
committergit-ubuntu importer <[email protected]>2024-03-28 04:34:44 +0000
commit177354d867fd4128e6601463f209ec32fa69ada2 (patch)
tree6fc4c076679c5cca2b7b38c01bfe51ddde477bb5
parent2311ea0328b5a5fe57df5b065ab2f09d8f22b7f0 (diff)
parent24d77807e93c2e7e3101d4fa95dbe59cad36f04d (diff)
3.50.0-2 (patches applied)applied/3.50.0-2
Imported using git-ubuntu import.
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/doc-add-document-listing-the-terms-of-use-for-providers.patch62
-rw-r--r--debian/patches/goabackend-update-Microsoft-client-ID.patch33
-rw-r--r--debian/patches/series2
-rw-r--r--doc/PROVIDER_POLICIES.md41
-rw-r--r--meson_options.txt4
6 files changed, 146 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 8add61c0..a654dae7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-online-accounts (3.50.0-2) experimental; urgency=medium
+
+ * Cherry-pick 2 patches to fix Microsoft authentication
+
+ -- Jeremy Bícha <[email protected]> Wed, 27 Mar 2024 17:23:52 -0400
+
gnome-online-accounts (3.50.0-1) experimental; urgency=medium
* New upstream release
diff --git a/debian/patches/doc-add-document-listing-the-terms-of-use-for-providers.patch b/debian/patches/doc-add-document-listing-the-terms-of-use-for-providers.patch
new file mode 100644
index 00000000..12ed60d2
--- /dev/null
+++ b/debian/patches/doc-add-document-listing-the-terms-of-use-for-providers.patch
@@ -0,0 +1,62 @@
+From: Andy Holmes <[email protected]>
+Date: Mon, 25 Mar 2024 00:57:17 -0700
+Subject: doc: add document listing the terms of use for providers
+
+Add a document which lists the various policies, terms of use and
+rate limits that apply to providers hosted on remote servers.
+
+(cherry picked from commit a30306a6f8770794c234cca0b59bb297d28be90d)
+
+Origin: future 3.50.1
+---
+ doc/PROVIDER_POLICIES.md | 41 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 41 insertions(+)
+ create mode 100644 doc/PROVIDER_POLICIES.md
+
+diff --git a/doc/PROVIDER_POLICIES.md b/doc/PROVIDER_POLICIES.md
+new file mode 100644
+index 0000000..b5f4f89
+--- /dev/null
++++ b/doc/PROVIDER_POLICIES.md
+@@ -0,0 +1,41 @@
++# Provider Policies
++
++This page documents any policies, terms of use and rate limits that apply to
++a given service provider. If you notice an out-of-date, incorrect or missing
++link, please open an issue or merge request as soon as possible.
++
++## Google
++
++The policies here apply to the `google` provider, including recommended and
++required authentication practices.
++
++### OAuth 2.0
++
++* [OAuth 2.0 Policies](https://developers.google.com/identity/protocols/oauth2/policies)
++* [OAuth 2.0 for Mobile & Desktop Apps](https://developers.google.com/identity/protocols/oauth2/native-app)
++
++### Rate Limits
++
++* [OAuth Application Rate Limits](https://support.google.com/cloud/answer/9028764)
++* [OAuth Application: Request Increase to New User Authorization Limit](https://support.google.com/code/contact/oauth_quota_increase)
++
++### Policy Changes
++
++* [Upcoming security changes to Google's OAuth 2.0 authorization endpoint in embedded webviews](https://developers.googleblog.com/2021/06/upcoming-security-changes-to-googles-oauth-2.0-authorization-endpoint.html)
++
++## Microsoft
++
++This policy applies to the GNOME Foundation's Entra account [email protected],
++not the user accounts registered with the "GNOME" application client ID.
++
++* [Microsoft Entra service limits and restrictions](https://learn.microsoft.com/entra/identity/users/directory-service-limits-restrictions)
++
++### Rate Limits
++
++These policies apply to user accounts and request rates.
++
++* Microsoft 365 Personal (formerly Office365) (`windows_live`)
++ * [Exchange Online limits](https://learn.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits)
++* Microsoft 365 Graph (`ms_graph`)
++ * [Microsoft Graph service-specific throttling limits](https://learn.microsoft.com/graph/throttling-limits)
++
diff --git a/debian/patches/goabackend-update-Microsoft-client-ID.patch b/debian/patches/goabackend-update-Microsoft-client-ID.patch
new file mode 100644
index 00000000..2dd0d78f
--- /dev/null
+++ b/debian/patches/goabackend-update-Microsoft-client-ID.patch
@@ -0,0 +1,33 @@
+From: Andy Holmes <[email protected]>
+Date: Tue, 19 Mar 2024 14:49:58 -0700
+Subject: goabackend: update Microsoft client ID
+
+Update the client ID used for Microsoft accounts, to use the new
+
+depends on https://gitlab.gnome.org/Infrastructure/Infrastructure/-/issues/1382
+
+(cherry picked from commit 47b3b4257e8c16763a581093cba751e83312a2dc)
+
+Origin: future 3.50.1
+---
+ meson_options.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/meson_options.txt b/meson_options.txt
+index ca83d2c..2f06676 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -17,10 +17,10 @@ option('owncloud', type: 'boolean', value: true, description: 'Enable ownCloud p
+ option('webdav', type: 'boolean', value: true, description: 'Enable WebDAV provider')
+
+ option('windows_live', type: 'boolean', value: true, description: 'Enable Windows Live provider')
+-option('windows_live_client_id', type: 'string', value: '0000000044067703', description: 'Windows Live OAuth 2.0 client id')
++option('windows_live_client_id', type: 'string', value: '8ef61e06-9fd5-49af-9b63-6983aede4213', description: 'Windows Live OAuth 2.0 client id')
+
+ option('ms_graph', type: 'boolean', value: true, description: 'Enable Microsoft 365 provider')
+-option('ms_graph_client_id', type: 'string', value: '', description: 'Microsoft 365 client id')
++option('ms_graph_client_id', type: 'string', value: '8ef61e06-9fd5-49af-9b63-6983aede4213', description: 'Microsoft 365 client id')
+
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk_doc to build documentation')
+ option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends on GObject)')
diff --git a/debian/patches/series b/debian/patches/series
index e69de29b..885c7466 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+goabackend-update-Microsoft-client-ID.patch
+doc-add-document-listing-the-terms-of-use-for-providers.patch
diff --git a/doc/PROVIDER_POLICIES.md b/doc/PROVIDER_POLICIES.md
new file mode 100644
index 00000000..b5f4f896
--- /dev/null
+++ b/doc/PROVIDER_POLICIES.md
@@ -0,0 +1,41 @@
+# Provider Policies
+
+This page documents any policies, terms of use and rate limits that apply to
+a given service provider. If you notice an out-of-date, incorrect or missing
+link, please open an issue or merge request as soon as possible.
+
+## Google
+
+The policies here apply to the `google` provider, including recommended and
+required authentication practices.
+
+### OAuth 2.0
+
+* [OAuth 2.0 Policies](https://developers.google.com/identity/protocols/oauth2/policies)
+* [OAuth 2.0 for Mobile & Desktop Apps](https://developers.google.com/identity/protocols/oauth2/native-app)
+
+### Rate Limits
+
+* [OAuth Application Rate Limits](https://support.google.com/cloud/answer/9028764)
+* [OAuth Application: Request Increase to New User Authorization Limit](https://support.google.com/code/contact/oauth_quota_increase)
+
+### Policy Changes
+
+* [Upcoming security changes to Google's OAuth 2.0 authorization endpoint in embedded webviews](https://developers.googleblog.com/2021/06/upcoming-security-changes-to-googles-oauth-2.0-authorization-endpoint.html)
+
+## Microsoft
+
+This policy applies to the GNOME Foundation's Entra account [email protected],
+not the user accounts registered with the "GNOME" application client ID.
+
+* [Microsoft Entra service limits and restrictions](https://learn.microsoft.com/entra/identity/users/directory-service-limits-restrictions)
+
+### Rate Limits
+
+These policies apply to user accounts and request rates.
+
+* Microsoft 365 Personal (formerly Office365) (`windows_live`)
+ * [Exchange Online limits](https://learn.microsoft.com/en-us/office365/servicedescriptions/exchange-online-service-description/exchange-online-limits)
+* Microsoft 365 Graph (`ms_graph`)
+ * [Microsoft Graph service-specific throttling limits](https://learn.microsoft.com/graph/throttling-limits)
+
diff --git a/meson_options.txt b/meson_options.txt
index ca83d2ce..2f066763 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -17,10 +17,10 @@ option('owncloud', type: 'boolean', value: true, description: 'Enable ownCloud p
option('webdav', type: 'boolean', value: true, description: 'Enable WebDAV provider')
option('windows_live', type: 'boolean', value: true, description: 'Enable Windows Live provider')
-option('windows_live_client_id', type: 'string', value: '0000000044067703', description: 'Windows Live OAuth 2.0 client id')
+option('windows_live_client_id', type: 'string', value: '8ef61e06-9fd5-49af-9b63-6983aede4213', description: 'Windows Live OAuth 2.0 client id')
option('ms_graph', type: 'boolean', value: true, description: 'Enable Microsoft 365 provider')
-option('ms_graph_client_id', type: 'string', value: '', description: 'Microsoft 365 client id')
+option('ms_graph_client_id', type: 'string', value: '8ef61e06-9fd5-49af-9b63-6983aede4213', description: 'Microsoft 365 client id')
option('gtk_doc', type: 'boolean', value: false, description: 'use gtk_doc to build documentation')
option('introspection', type: 'boolean', value: true, description: 'Enable GObject Introspection (depends on GObject)')