From dd1aeb4be1cedece9c84691121c85a6fb03f3514 Mon Sep 17 00:00:00 2001 From: Philipp Balzarek Date: Tue, 10 Apr 2012 14:52:43 +0200 Subject: [PATCH] prepare merge --- .gitignore | 8 ++ {Network => src/Network}/XMPP.hs | 0 {Network => src/Network}/XMPP/Address.hs | 0 {Network => src/Network}/XMPP/SASL.hs | 0 {Network => src/Network}/XMPP/Session.hs | 0 {Network => src/Network}/XMPP/SessionOld.hs | 0 {Network => src/Network}/XMPP/Stanza.hs | 0 {Network => src/Network}/XMPP/Stream.hs | 0 {Network => src/Network}/XMPP/TLS.hs | 0 src/Network/XMPP/TLS_flymake.hs | 30 +++++++ {Network => src/Network}/XMPP/Types.hs | 0 {Network => src/Network}/XMPP/Utilities.hs | 0 src/Network/XMPP_flymake.hs | 89 +++++++++++++++++++++ 13 files changed, 127 insertions(+) create mode 100644 .gitignore rename {Network => src/Network}/XMPP.hs (100%) rename {Network => src/Network}/XMPP/Address.hs (100%) rename {Network => src/Network}/XMPP/SASL.hs (100%) rename {Network => src/Network}/XMPP/Session.hs (100%) rename {Network => src/Network}/XMPP/SessionOld.hs (100%) rename {Network => src/Network}/XMPP/Stanza.hs (100%) rename {Network => src/Network}/XMPP/Stream.hs (100%) rename {Network => src/Network}/XMPP/TLS.hs (100%) create mode 100644 src/Network/XMPP/TLS_flymake.hs rename {Network => src/Network}/XMPP/Types.hs (100%) rename {Network => src/Network}/XMPP/Utilities.hs (100%) create mode 100644 src/Network/XMPP_flymake.hs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d7ddec5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +dist/ +cabal-dev/ +*.o +*.hi +*~ +*# +*.#* +*_flymake.hs \ No newline at end of file diff --git a/Network/XMPP.hs b/src/Network/XMPP.hs similarity index 100% rename from Network/XMPP.hs rename to src/Network/XMPP.hs diff --git a/Network/XMPP/Address.hs b/src/Network/XMPP/Address.hs similarity index 100% rename from Network/XMPP/Address.hs rename to src/Network/XMPP/Address.hs diff --git a/Network/XMPP/SASL.hs b/src/Network/XMPP/SASL.hs similarity index 100% rename from Network/XMPP/SASL.hs rename to src/Network/XMPP/SASL.hs diff --git a/Network/XMPP/Session.hs b/src/Network/XMPP/Session.hs similarity index 100% rename from Network/XMPP/Session.hs rename to src/Network/XMPP/Session.hs diff --git a/Network/XMPP/SessionOld.hs b/src/Network/XMPP/SessionOld.hs similarity index 100% rename from Network/XMPP/SessionOld.hs rename to src/Network/XMPP/SessionOld.hs diff --git a/Network/XMPP/Stanza.hs b/src/Network/XMPP/Stanza.hs similarity index 100% rename from Network/XMPP/Stanza.hs rename to src/Network/XMPP/Stanza.hs diff --git a/Network/XMPP/Stream.hs b/src/Network/XMPP/Stream.hs similarity index 100% rename from Network/XMPP/Stream.hs rename to src/Network/XMPP/Stream.hs diff --git a/Network/XMPP/TLS.hs b/src/Network/XMPP/TLS.hs similarity index 100% rename from Network/XMPP/TLS.hs rename to src/Network/XMPP/TLS.hs diff --git a/src/Network/XMPP/TLS_flymake.hs b/src/Network/XMPP/TLS_flymake.hs new file mode 100644 index 0000000..a0ac88b --- /dev/null +++ b/src/Network/XMPP/TLS_flymake.hs @@ -0,0 +1,30 @@ +-- Copyright © 2010-2012 Jon Kristensen. See the LICENSE file in the +-- Pontarius distribution for more details. + +-- TODO: TLS12 when supported in tls; TODO: TLS11 results in a read error - bug? +-- TODO: cipher_AES128_SHA1 = TLS_RSA_WITH_AES_128_CBC_SHA? +-- TODO: Compression? +-- TODO: Validate certificate + +{-# OPTIONS_HADDOCK hide #-} + +module Network.XMPP.TLS (tlsParams) where + +import Network.TLS (TLSCertificateUsage (CertificateUsageAccept), + TLSParams (..), Version (SSL3, TLS10, TLS11), + defaultLogging, nullCompression) +import Network.TLS.Extra (cipher_AES128_SHA1) + + +tlsParams :: TLSParams + +tlsParams = TLSParams { pConnectVersion = TLS10 + , pAllowedVersions = [SSL3, TLS10,TLS11] + , pCiphers = [cipher_AES128_SHA1] + , pCompressions = [nullCompression] + , pWantClientCert = False -- Used for servers + , pUseSecureRenegotiation = False -- No renegotiation + , pCertificates = [] -- TODO + , pLogging = defaultLogging -- TODO + , onCertificatesRecv = \ certificate -> + return CertificateUsageAccept } diff --git a/Network/XMPP/Types.hs b/src/Network/XMPP/Types.hs similarity index 100% rename from Network/XMPP/Types.hs rename to src/Network/XMPP/Types.hs diff --git a/Network/XMPP/Utilities.hs b/src/Network/XMPP/Utilities.hs similarity index 100% rename from Network/XMPP/Utilities.hs rename to src/Network/XMPP/Utilities.hs diff --git a/src/Network/XMPP_flymake.hs b/src/Network/XMPP_flymake.hs new file mode 100644 index 0000000..57be806 --- /dev/null +++ b/src/Network/XMPP_flymake.hs @@ -0,0 +1,89 @@ +-- Copyright © 2010-2012 Jon Kristensen. See the LICENSE file in the +-- Pontarius distribution for more details. + +-- | +-- Module: $Header$ +-- Description: Pontarius API +-- Copyright: Copyright © 2010-2012 Jon Kristensen +-- License: Apache License 2.0 +-- +-- Maintainer: jon.kristensen@nejla.com +-- Stability: unstable +-- Portability: portable +-- +-- XMPP is an open standard, extendable, and secure communications +-- protocol designed on top of XML, TLS, and SASL. Pontarius XMPP is +-- an XMPP client library, implementing the core capabilities of XMPP +-- (RFC 6120). +-- +-- Developers using this library are assumed to understand how XMPP +-- works. +-- +-- This module will be documented soon. +-- +-- Note that we are not recommending anyone to use Pontarius XMPP at +-- this time as it's still in an experimental stage and will have its +-- API and data types modified frequently. + +module Network.XMPP ( -- Network.XMPP.JID + Address (..) + , Localpart + , Domainpart + , Resourcepart + , isFull + , isBare + , fromString + , fromStrings + + -- Network.XMPP.Session + , runXMPPT + , hookStreamsOpenedEvent + , hookDisconnectedEvent + , destroy + , openStreams + , create + + -- , ClientHandler (..) + -- , ClientState (..) + -- , ConnectResult (..) + -- , HostName + -- , Password + -- , PortNumber + -- , Resource + -- , Session + -- , TerminationReason + -- , UserName + -- , sendIQ + -- , sendPresence + -- , sendMessage + -- , connect + -- , openStreams + -- , tlsSecureStreams + -- , authenticate + -- , session + -- , OpenStreamResult (..) + -- , SecureWithTLSResult (..) + -- , AuthenticateResult (..) + + -- Network.XMPP.Stanza + , StanzaID (SID) + , From + , To + , LangTag + , MessageType (..) + , Message (..) + , PresenceType (..) + , Presence (..) + , IQ (..) + , iqPayloadNamespace + , iqPayload ) where + +import Network.XMPP.Address +-- import Network.XMPP.SASL +import Network.XMPP.Session +import Network.XMPP.Stanza +import Network.XMPP.Utilities +import Network.XMPP.Types +-- import Network.XMPP.TLS +import Network.XMPP.Stream +