summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-10-04 15:40:28 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-04 23:17:05 +0200
commit454527960e8a68191919397f225acec99b837c5e (patch)
treee6cba751a6cddd26759320b64e582b02c5393c63
parent1e314dc8c55c94f977b8ea07e5e6e448d13d870f (diff)
gui: add a widget to display all pending authorizations
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/scm/webid-oidc/client/gui/Makefile.am4
-rw-r--r--src/scm/webid-oidc/client/gui/application.scm3
-rw-r--r--src/scm/webid-oidc/client/gui/authorizations-widget.scm150
4 files changed, 157 insertions, 1 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 04cbadc..53cc8aa 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -43,6 +43,7 @@ src/scm/webid-oidc/client/gui/application-hooks.scm
src/scm/webid-oidc/client/gui/account-widget.scm
src/scm/webid-oidc/client/gui/accounts-widget.scm
src/scm/webid-oidc/client/gui/authorization-prompt.scm
+src/scm/webid-oidc/client/gui/authorizations-widget.scm
src/scm/webid-oidc/client/gui/client-widget.scm
src/scm/webid-oidc/client/gui/clock.scm
src/scm/webid-oidc/client/gui/settings.scm
diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am
index 5e4f4c5..97b1cb6 100644
--- a/src/scm/webid-oidc/client/gui/Makefile.am
+++ b/src/scm/webid-oidc/client/gui/Makefile.am
@@ -22,7 +22,8 @@ dist_guiclientwebidoidcmod_DATA += \
%reldir%/application-hooks.scm \
%reldir%/application.scm \
%reldir%/authorization-prompt.scm \
- %reldir%/clock.scm
+ %reldir%/clock.scm \
+ %reldir%/authorizations-widget.scm
guiclientwebidoidcgo_DATA += \
%reldir%/settings.go \
@@ -32,4 +33,5 @@ guiclientwebidoidcgo_DATA += \
%reldir%/application-hooks.go \
%reldir%/application.go \
%reldir%/authorization-prompt.go \
+ %reldir%/authorizations-widget.go \
%reldir%/clock.go
diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm
index 25708b8..bfd5f7a 100644
--- a/src/scm/webid-oidc/client/gui/application.scm
+++ b/src/scm/webid-oidc/client/gui/application.scm
@@ -38,6 +38,7 @@
#:use-module ((webid-oidc client gui settings) #:prefix settings:)
#:use-module ((webid-oidc client gui client-widget) #:prefix client:)
#:use-module ((webid-oidc client gui accounts-widget) #:prefix accounts:)
+ #:use-module ((webid-oidc client gui authorizations-widget) #:prefix authorizations:)
#:use-module (webid-oidc client gui application-hooks)
#:use-module (web uri)
#:use-module (web response)
@@ -68,9 +69,11 @@
#:application application))
(client client:client-widget)
(accounts accounts:accounts-widget)
+ (authorizations authorizations:authorizations-widget)
(content (box:new (symbol->orientation 'horizontal) 12)))
(box:pack-end content client #t #t 0)
(box:pack-end content accounts #t #t 0)
+ (box:pack-end content authorizations #t #t 0)
(add window content)
(show-all window)))
diff --git a/src/scm/webid-oidc/client/gui/authorizations-widget.scm b/src/scm/webid-oidc/client/gui/authorizations-widget.scm
new file mode 100644
index 0000000..ba76185
--- /dev/null
+++ b/src/scm/webid-oidc/client/gui/authorizations-widget.scm
@@ -0,0 +1,150 @@
+;; disfluid, implementation of the Solid specification
+;; Copyright (C) 2021 Vivien Kraus
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU Affero General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU Affero General Public License for more details.
+
+;; You should have received a copy of the GNU Affero General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+(define-module (webid-oidc client gui authorizations-widget)
+ #:use-module (gi)
+ #:use-module (gi types)
+ #:use-module (gi util)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 exceptions)
+ #:use-module (ice-9 i18n)
+ #:use-module (ice-9 receive)
+ #:use-module (ice-9 optargs)
+ #:use-module (ice-9 pretty-print)
+ #:use-module (ice-9 atomic)
+ #:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-19)
+ #:use-module (srfi srfi-26)
+ #:use-module (webid-oidc errors)
+ #:use-module ((webid-oidc stubs) #:prefix stubs:)
+ #:use-module ((webid-oidc config) #:prefix config:)
+ #:use-module (webid-oidc web-i18n)
+ #:use-module (webid-oidc client client)
+ #:use-module (webid-oidc client accounts)
+ #:use-module (webid-oidc client gui authorization-prompt)
+ #:use-module ((webid-oidc client gui settings) #:prefix settings:)
+ #:use-module ((webid-oidc client gui clock) #:prefix clock:)
+ #:use-module (webid-oidc client gui application-hooks)
+ #:use-module (webid-oidc jwk)
+ #:use-module (webid-oidc oidc-id-token)
+ #:use-module (web uri)
+ #:use-module (web response)
+ #:use-module (rnrs bytevectors)
+ #:use-module (oop goops)
+ #:declarative? #t
+ #:duplicates (merge-generics)
+ #:export
+ (
+ authorizations-widget
+ use-authorizations-widget
+ ))
+
+(push-duplicate-handler! 'merge-generics)
+
+;; This avoids a crash when compiling the module
+(use-typelibs ("GdkPixbuf" "2.0")
+ ("Gtk" "3.0"))
+
+(define authorizations-widget #f)
+(define by-uri (make-hash-table))
+
+(define authorizations-widget #f)
+
+;; Since authorizations may be requested by any threads, they are
+;; collected here and a timer updates the GUI every so often.
+(define pending-authorizations
+ (make-atomic-box '()))
+
+(define (update-ui)
+ (let ((authz (atomic-box-ref pending-authorizations)))
+ (let ((confirmed (atomic-box-compare-and-swap! pending-authorizations authz '())))
+ (if (eq? authz confirmed)
+ (let add-authorization ((authz authz))
+ (match authz
+ (() ;; done
+ #t)
+ (((reason uri continuation) authz ...)
+ (let ((value (uri->string uri)))
+ (match (or (hash-ref by-uri value)
+ (receive (builder widget handle)
+ ((@ (webid-oidc client gui authorization-prompt)
+ make-authorization-prompt) uri)
+ (let ((ret `(,builder ,widget ,handle)))
+ (hash-set! by-uri value ret)
+ (box:pack-start authorizations-widget widget #t #t 0)
+ ret)))
+ ((_ widget handle)
+ ;; Put it on top
+ (container:remove authorizations-widget widget)
+ (box:pack-start authorizations-widget widget #t #t 0)
+ ;; Add (reason, continuation) to the
+ ;; existing or created widget
+ (handle reason
+ (lambda (code)
+ ;; When the button is
+ ;; clicked, first remove
+ ;; the widget if it still
+ ;; exists
+ (when (hash-ref by-uri value)
+ (hash-remove! by-uri value)
+ (container:remove authorizations-widget widget))
+ ((@ (ice-9 threads) call-with-new-thread)
+ (lambda ()
+ ;; In case the
+ ;; continuation expects
+ ;; further authorizations:
+ (use-authorizations-widget
+ (lambda ()
+ (continuation code)))))))))))))
+ ;; Else, retry
+ (update-ui)))))
+
+(define (use-authorizations-widget f)
+ (let ((prompt (make-prompt-tag)))
+ (call-with-prompt prompt
+ (lambda ()
+ (parameterize
+ ((authorization-process
+ (lambda* (uri #:key reason)
+ (abort-to-prompt
+ prompt
+ (lambda (continuation)
+ (let save ((other (atomic-box-ref pending-authorizations)))
+ (let ((confirmed
+ (atomic-box-compare-and-swap!
+ pending-authorizations
+ other
+ `((,reason ,uri ,continuation) ,@other))))
+ (unless (eq? confirmed other)
+ (save (atomic-box-ref pending-authorizations))))))))))
+ (f)))
+ (lambda (continuation handler)
+ (handler continuation)))))
+
+(define (update-ui-next)
+ (update-ui)
+ (clock:wait
+ (lambda ()
+ (update-ui-next))))
+
+(define (build-widget app)
+ (unless authorizations-widget
+ (set! authorizations-widget (box:new (symbol->orientation 'vertical) 8))
+ (clock:wait
+ (lambda ()
+ (update-ui-next)))))
+
+(add-hook! application-activated-hook build-widget)