diff --git a/CHANGES.md b/CHANGES.md --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,10 @@ ### Minor Releases + * Version 0.1.2 (May 26, 2022) + + - Update dependencies to their latest versions (thanks to @maksbotan) + * Version 0.1.1 (May 24, 2021) - Update dependencies to their latest versions (thanks to @maksbotan) diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2020-2021 Peter J. Jones +Copyright (c) 2020-2022 Peter J. Jones All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.md b/README.md deleted file mode 100644 --- a/README.md +++ /dev/null @@ -1,64 +0,0 @@ -[![tests](https://github.com/pjones/openid-connect/actions/workflows/tests.yml/badge.svg)](https://github.com/pjones/openid-connect/actions/workflows/tests.yml) - -OpenID Connect 1.0 in Haskell -============================= - -An OpenID Connect 1.0 compliant library written in Haskell. - -The primary goals of this package are security and usability. - -Client Features ---------------- - -This library mostly focuses on the client side of the OpenID Connect -protocol. - -Supported flows: - - * [x] Authorization Code (see `OpenID.Connect.Client.Flow.AuthorizationCode`) (§3.1) - * [ ] Implicit (partial implementation, patches welcome) (§3.2) - * [ ] Hybrid (partial implementation, patches welcome) (§3.3) - -Significant features: - - * ID Token validation via the [jose][] library (§2) - * Additional OIDC claim validation (e.g., `nonce`, `azp`, etc.) (§2) - * Full support for all defined forms of client authentication (§9) - * Handles session cookie generation and validation (§3.1.2.1, §15.5.2) - * Dynamic Client Registration 1.0. - -Provider Features ------------------ - -Some utility types and functions are available to assist in the -writing of an OIDC Provider: - - * Discovery document (OpenID Connect Discovery 1.0 §3) - * Key generation (simple wrapper around [jose][]) - -[jose]: https://hackage.haskell.org/package/jose - -Certification Status --------------------- - -We plan on fully [certifying][cert] this implementation using the -following profiles: - - * [ ] Basic Relying Party - * [ ] Implicit Relying Party - * [ ] Hybrid Relying Party - * [ ] Relying Party Using Configuration Information - * [ ] Dynamic Relying Party - * [ ] Form Post Relying Party - -[cert]: https://openid.net/certification/instructions/ - -Specifications and RFCs ------------------------ - - * [OpenID Connect Core](http://openid.net/specs/openid-connect-core-1_0.html) - * [OpenID Connect Discovery](http://openid.net/specs/openid-connect-discovery-1_0.html) - * [The OAuth 2.0 Authorization Framework (RFC6749)](https://tools.ietf.org/html/rfc6749) - * [JSON Web Token (RFC7519)](https://tools.ietf.org/html/rfc7519) - * [JSON Web Signature (RFC7515)](https://tools.ietf.org/html/rfc7515) - * [JSON Web Key (RFC7517)](https://www.rfc-editor.org/rfc/rfc7517.htmlhttps://www.rfc-editor.org/rfc/rfc7517.html) diff --git a/Setup.hs b/Setup.hs deleted file mode 100644 --- a/Setup.hs +++ /dev/null @@ -1,2 +0,0 @@ -import Distribution.Simple -main = defaultMain diff --git a/openid-connect.cabal b/openid-connect.cabal --- a/openid-connect.cabal +++ b/openid-connect.cabal @@ -1,15 +1,15 @@ cabal-version: 2.2 name: openid-connect -version: 0.1.1 +version: 0.1.2 license: BSD-2-Clause license-file: LICENSE author: Peter Jones maintainer: Peter Jones -copyright: Copyright (c) 2020-2021 Peter Jones +copyright: Copyright (c) 2020-2022 Peter Jones homepage: https://github.com/pjones/openid-connect bug-reports: https://github.com/pjones/openid-connect/issues category: Network -tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 +tested-with: GHC ==8.10.7 || ==9.0.2 synopsis: An OpenID Connect library that does all the heavy lifting for you @@ -24,7 +24,6 @@ -------------------------------------------------------------------------------- extra-source-files: - README.md CHANGES.md example/*.sh @@ -80,20 +79,21 @@ -------------------------------------------------------------------------------- common dependencies build-depends: - , aeson >=1.3 && <1.6 + , aeson >=1.3 && <2.1 , base >=4.9 && <5.0 , bytestring >=0.10 && <0.12 , case-insensitive ^>=1.2 + , containers ^>=0.6 , cookie ^>=0.4 , cryptonite >=0.25 && <1.0 , http-client >=0.6 && <0.8 , http-types ^>=0.12 - , jose ^>=0.8 - , lens >=4.0 && <5.1 + , jose >=0.8 && <0.10 + , lens >=4.0 && <5.2 , memory >=0.14 && <1.0 - , mtl ^>=2.2 + , mtl >=2.2 && <2.4 , network-uri >=2.6 && <2.8 - , text ^>=1.2 + , text >=1.2 && <2.1 , time >=1.8 && <2.0 , unordered-containers ^>=0.2 @@ -133,15 +133,15 @@ buildable: False build-depends: - , blaze-html >=0.9 - , http-client-tls >=0.3 + , blaze-html ^>=0.9 + , http-client-tls ^>=0.3 , openid-connect - , optparse-applicative >=0.14 - , servant >=0.16 - , servant-blaze >=0.9 - , servant-server >=0.16 - , warp >=3.2 - , warp-tls >=3.2 + , optparse-applicative >=0.14 && <0.18 + , servant >=0.16 && <0.20 + , servant-blaze ^>=0.9 + , servant-server >=0.16 && <0.20 + , warp >=3.2 && <3.4 + , warp-tls >=3.2 && <3.4 -------------------------------------------------------------------------------- test-suite test diff --git a/src/OpenID/Connect/Client/TokenResponse.hs b/src/OpenID/Connect/Client/TokenResponse.hs --- a/src/OpenID/Connect/Client/TokenResponse.hs +++ b/src/OpenID/Connect/Client/TokenResponse.hs @@ -1,3 +1,5 @@ +{-# LANGUAGE CPP #-} + {-| Copyright: @@ -32,7 +34,6 @@ import qualified Data.ByteString.Lazy.Char8 as LChar8 import Data.Function ((&)) import Data.Functor.Identity -import qualified Data.HashMap.Strict as Map import Data.Maybe (isJust) import Data.Text (Text) import qualified Data.Text.Encoding as Text @@ -40,6 +41,12 @@ import OpenID.Connect.Authentication (ClientID) import OpenID.Connect.Client.Provider import OpenID.Connect.TokenResponse + +#if MIN_VERSION_aeson(2, 0, 0) +import qualified Data.Map.Strict as Map +#else +import qualified Data.HashMap.Strict as Map +#endif -------------------------------------------------------------------------------- -- | Decode the compacted identity token into a 'SignedJWT'.