X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=blobdiff_plain;f=pdns-pipe-nmc.hs;h=737c9e771f4d0c81c32518eae45e97961a332231;hp=4d47e5045bcc10c70b5d8c3bfcd56d99f432a669;hb=a94698b56a0faf340c007fe11b6ac7bcb2c566e2;hpb=35cea210f8d3a22afd24848441b5d34702d83239

diff --git a/pdns-pipe-nmc.hs b/pdns-pipe-nmc.hs
index 4d47e50..737c9e7 100644
--- a/pdns-pipe-nmc.hs
+++ b/pdns-pipe-nmc.hs
@@ -2,11 +2,17 @@
 
 module Main where
 
-import System.IO
+import Prelude hiding (readFile)
+import System.Environment
+import System.IO hiding (readFile)
+import System.IO.Error
+import Control.Exception
+import Text.Show.Pretty hiding (String)
 import Control.Monad
-import qualified Data.ByteString.Char8 as C (pack, unpack)
-import qualified Data.ByteString.Lazy.Char8 as L (pack, unpack)
-import Data.ByteString.Lazy as BS hiding (reverse, putStr, putStrLn)
+import Data.ByteString.Lazy hiding (reverse, putStr, putStrLn, head)
+import qualified Data.ByteString.Char8 as C (pack)
+import qualified Data.ByteString.Lazy.Char8 as L (pack)
+import qualified Data.Text as T (pack)
 import Data.List.Split
 import Data.Aeson (encode, decode, Value(..))
 import Network.HTTP.Types
@@ -18,12 +24,13 @@ import Config
 import PowerDns
 import NmcRpc
 import NmcDom
+import NmcTransform
 
 confFile = "/etc/namecoin.conf"
 
 -- HTTP/JsonRpc interface
 
-qReq :: Config -> ByteString -> ByteString -> Request m
+qReq :: Config -> String -> String -> Request m
 qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
              $ def { host           = (C.pack (rpchost cf))
                    , port           = (rpcport cf)
@@ -35,44 +42,36 @@ qReq cf q id = applyBasicAuth (C.pack (rpcuser cf)) (C.pack (rpcpassword cf))
                    , requestBody    = RequestBodyLBS $ encode $
                                       JsonRpcRequest JsonRpcV1
                                                      "name_show"
-                                                     [q]
-                                                     (String "pdns-nmc")
+                                                     [L.pack q]
+                                                     (String (T.pack id))
                    , checkStatus    = \_ _ _ -> Nothing
                    }
 
-qRsp :: Response ByteString -> Either String NmcDom
+qRsp :: Response ByteString -> Either String ByteString
 qRsp rsp =
     case parseJsonRpc (responseBody rsp) :: Either JsonRpcError NmcRes of
       Left  jerr -> 
         case (jrpcErrCode jerr) of
-          -4 -> Right emptyNmcDom
+          -4 -> Right "{}"      -- this is how non-existent entry is returned
           _  -> Left $ "JsonRpc error response: " ++ (show jerr)
-      Right jrsp ->
-        case resValue jrsp of
-          "" -> Right emptyNmcDom
-          vstr ->
-            case decode vstr :: Maybe NmcDom of
-              Nothing  -> Left $ "Unparseable value: " ++ (show vstr)
-              Just dom -> Right dom
+      Right jrsp -> Right $ resValue jrsp
 
 -- NMC interface
 
-queryNmc :: Manager -> Config -> String -> String
-         -> IO (Either String NmcDom)
-queryNmc mgr cfg fqdn qid = do
+queryOpNmc cfg mgr qid key =
+  runResourceT (httpLbs (qReq cfg key qid) mgr) >>= return . qRsp
+
+queryOpFile key = catch (readFile key >>= return . Right)
+                        (\e -> return (Left (show (e :: IOException))))
+
+queryDom queryOp fqdn =
   case reverse (splitOn "." fqdn) of
-    "bit":dn:xs -> do
-      rsp <- runResourceT $
-             httpLbs (qReq cfg (L.pack ("d/" ++ dn)) (L.pack qid)) mgr
-      return $ case qRsp rsp of
-        Left  err -> Left err
-        Right dom -> Right $ descendNmc xs dom
-    _           ->
-      return $ Left "Only \".bit\" domain is supported"
+    "bit":dn:xs -> descendNmcDom queryOp xs $ seedNmcDom dn
+    _           -> return $ Left "Only \".bit\" domain is supported"
 
--- Main entry
+-- Main entries
 
-main = do
+mainPdnsNmc = do
 
   cfg <- readConfig confFile
 
@@ -102,14 +101,33 @@ main = do
       Right preq -> do
         case preq of
           PdnsRequestQ qname qtype id _ _ _ ->
-            queryNmc mgr cfg qname id >>= putStr . (pdnsOut ver id qname qtype)
+            queryDom (queryOpNmc cfg mgr id) qname >>= putStr . (pdnsOut ver id qname qtype)
           PdnsRequestAXFR xfrreq ->
             putStr $ pdnsReport ("No support for AXFR " ++ xfrreq)
           PdnsRequestPing -> putStrLn "END"
 
--- for testing
+-- query by key from Namecoin
 
-ask str = do
+mainOne key = do
   cfg <- readConfig confFile
   mgr <- newManager def
-  queryNmc mgr cfg str "askid" >>= putStr . (pdnsOut 1 "askid" str RRTypeANY)
+  dom <- queryDom (queryOpNmc cfg mgr "_") key
+  putStrLn $ ppShow dom
+  putStr $ pdnsOut 1 "_" key RRTypeANY dom
+
+-- using file backend for testing json domain data
+
+mainFile key = do
+  dom <- queryDom queryOpFile key
+  putStrLn $ ppShow dom
+  putStr $ pdnsOut 1 "+" key RRTypeANY dom
+
+-- Entry point
+
+main = do
+  args <- getArgs
+  case args of
+    []         -> mainPdnsNmc
+    [key]      -> mainOne key
+    ["-f",key] -> mainFile key
+    _ -> error $ "usage: empty args, or \"[-f] <fqdn>\""