pms-infra-cmdrun (empty) → 0.0.1.0
raw patch · 11 files changed
+872/−0 lines, 11 filesdep +aesondep +asyncdep +base
Dependencies added: aeson, async, base, bytestring, conduit, data-default, directory, fast-logger, filepath, hspec, hspec-discover, lens, monad-logger, mtl, pms-domain-model, pms-infra-cmdrun, process, safe-exceptions, stm, text, transformers, unix
Files
- CHANGELOG.md +5/−0
- LICENSE +202/−0
- README.md +16/−0
- pms-infra-cmdrun.cabal +138/−0
- src/PMS/Infra/CmdRun/App/Control.hs +59/−0
- src/PMS/Infra/CmdRun/DM/Constant.hs +8/−0
- src/PMS/Infra/CmdRun/DM/Type.hs +49/−0
- src/PMS/Infra/CmdRun/DS/Core.hs +187/−0
- src/PMS/Infra/CmdRun/DS/Utility.hs +104/−0
- test/PMS/Infra/CmdRun/App/ControlSpec.hs +103/−0
- test/Spec.hs +1/−0
+ CHANGELOG.md view
@@ -0,0 +1,5 @@+# Revision history for pms-infra-cmdrun++## 0.0.1.0 -- 2025-06-22++* First version.
+ LICENSE view
@@ -0,0 +1,202 @@++ Apache License+ Version 2.0, January 2004+ http://www.apache.org/licenses/++ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION++ 1. Definitions.++ "License" shall mean the terms and conditions for use, reproduction,+ and distribution as defined by Sections 1 through 9 of this document.++ "Licensor" shall mean the copyright owner or entity authorized by+ the copyright owner that is granting the License.++ "Legal Entity" shall mean the union of the acting entity and all+ other entities that control, are controlled by, or are under common+ control with that entity. For the purposes of this definition,+ "control" means (i) the power, direct or indirect, to cause the+ direction or management of such entity, whether by contract or+ otherwise, or (ii) ownership of fifty percent (50%) or more of the+ outstanding shares, or (iii) beneficial ownership of such entity.++ "You" (or "Your") shall mean an individual or Legal Entity+ exercising permissions granted by this License.++ "Source" form shall mean the preferred form for making modifications,+ including but not limited to software source code, documentation+ source, and configuration files.++ "Object" form shall mean any form resulting from mechanical+ transformation or translation of a Source form, including but+ not limited to compiled object code, generated documentation,+ and conversions to other media types.++ "Work" shall mean the work of authorship, whether in Source or+ Object form, made available under the License, as indicated by a+ copyright notice that is included in or attached to the work+ (an example is provided in the Appendix below).++ "Derivative Works" shall mean any work, whether in Source or Object+ form, that is based on (or derived from) the Work and for which the+ editorial revisions, annotations, elaborations, or other modifications+ represent, as a whole, an original work of authorship. For the purposes+ of this License, Derivative Works shall not include works that remain+ separable from, or merely link (or bind by name) to the interfaces of,+ the Work and Derivative Works thereof.++ "Contribution" shall mean any work of authorship, including+ the original version of the Work and any modifications or additions+ to that Work or Derivative Works thereof, that is intentionally+ submitted to Licensor for inclusion in the Work by the copyright owner+ or by an individual or Legal Entity authorized to submit on behalf of+ the copyright owner. For the purposes of this definition, "submitted"+ means any form of electronic, verbal, or written communication sent+ to the Licensor or its representatives, including but not limited to+ communication on electronic mailing lists, source code control systems,+ and issue tracking systems that are managed by, or on behalf of, the+ Licensor for the purpose of discussing and improving the Work, but+ excluding communication that is conspicuously marked or otherwise+ designated in writing by the copyright owner as "Not a Contribution."++ "Contributor" shall mean Licensor and any individual or Legal Entity+ on behalf of whom a Contribution has been received by Licensor and+ subsequently incorporated within the Work.++ 2. Grant of Copyright License. Subject to the terms and conditions of+ this License, each Contributor hereby grants to You a perpetual,+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable+ copyright license to reproduce, prepare Derivative Works of,+ publicly display, publicly perform, sublicense, and distribute the+ Work and such Derivative Works in Source or Object form.++ 3. Grant of Patent License. Subject to the terms and conditions of+ this License, each Contributor hereby grants to You a perpetual,+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable+ (except as stated in this section) patent license to make, have made,+ use, offer to sell, sell, import, and otherwise transfer the Work,+ where such license applies only to those patent claims licensable+ by such Contributor that are necessarily infringed by their+ Contribution(s) alone or by combination of their Contribution(s)+ with the Work to which such Contribution(s) was submitted. If You+ institute patent litigation against any entity (including a+ cross-claim or counterclaim in a lawsuit) alleging that the Work+ or a Contribution incorporated within the Work constitutes direct+ or contributory patent infringement, then any patent licenses+ granted to You under this License for that Work shall terminate+ as of the date such litigation is filed.++ 4. Redistribution. You may reproduce and distribute copies of the+ Work or Derivative Works thereof in any medium, with or without+ modifications, and in Source or Object form, provided that You+ meet the following conditions:++ (a) You must give any other recipients of the Work or+ Derivative Works a copy of this License; and++ (b) You must cause any modified files to carry prominent notices+ stating that You changed the files; and++ (c) You must retain, in the Source form of any Derivative Works+ that You distribute, all copyright, patent, trademark, and+ attribution notices from the Source form of the Work,+ excluding those notices that do not pertain to any part of+ the Derivative Works; and++ (d) If the Work includes a "NOTICE" text file as part of its+ distribution, then any Derivative Works that You distribute must+ include a readable copy of the attribution notices contained+ within such NOTICE file, excluding those notices that do not+ pertain to any part of the Derivative Works, in at least one+ of the following places: within a NOTICE text file distributed+ as part of the Derivative Works; within the Source form or+ documentation, if provided along with the Derivative Works; or,+ within a display generated by the Derivative Works, if and+ wherever such third-party notices normally appear. The contents+ of the NOTICE file are for informational purposes only and+ do not modify the License. You may add Your own attribution+ notices within Derivative Works that You distribute, alongside+ or as an addendum to the NOTICE text from the Work, provided+ that such additional attribution notices cannot be construed+ as modifying the License.++ You may add Your own copyright statement to Your modifications and+ may provide additional or different license terms and conditions+ for use, reproduction, or distribution of Your modifications, or+ for any such Derivative Works as a whole, provided Your use,+ reproduction, and distribution of the Work otherwise complies with+ the conditions stated in this License.++ 5. Submission of Contributions. Unless You explicitly state otherwise,+ any Contribution intentionally submitted for inclusion in the Work+ by You to the Licensor shall be under the terms and conditions of+ this License, without any additional terms or conditions.+ Notwithstanding the above, nothing herein shall supersede or modify+ the terms of any separate license agreement you may have executed+ with Licensor regarding such Contributions.++ 6. Trademarks. This License does not grant permission to use the trade+ names, trademarks, service marks, or product names of the Licensor,+ except as required for reasonable and customary use in describing the+ origin of the Work and reproducing the content of the NOTICE file.++ 7. Disclaimer of Warranty. Unless required by applicable law or+ agreed to in writing, Licensor provides the Work (and each+ Contributor provides its Contributions) on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or+ implied, including, without limitation, any warranties or conditions+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A+ PARTICULAR PURPOSE. You are solely responsible for determining the+ appropriateness of using or redistributing the Work and assume any+ risks associated with Your exercise of permissions under this License.++ 8. Limitation of Liability. In no event and under no legal theory,+ whether in tort (including negligence), contract, or otherwise,+ unless required by applicable law (such as deliberate and grossly+ negligent acts) or agreed to in writing, shall any Contributor be+ liable to You for damages, including any direct, indirect, special,+ incidental, or consequential damages of any character arising as a+ result of this License or out of the use or inability to use the+ Work (including but not limited to damages for loss of goodwill,+ work stoppage, computer failure or malfunction, or any and all+ other commercial damages or losses), even if such Contributor+ has been advised of the possibility of such damages.++ 9. Accepting Warranty or Additional Liability. While redistributing+ the Work or Derivative Works thereof, You may choose to offer,+ and charge a fee for, acceptance of support, warranty, indemnity,+ or other liability obligations and/or rights consistent with this+ License. However, in accepting such obligations, You may act only+ on Your own behalf and on Your sole responsibility, not on behalf+ of any other Contributor, and only if You agree to indemnify,+ defend, and hold each Contributor harmless for any liability+ incurred by, or claims asserted against, such Contributor by reason+ of your accepting any such warranty or additional liability.++ END OF TERMS AND CONDITIONS++ APPENDIX: How to apply the Apache License to your work.++ To apply the Apache License to your work, attach the following+ boilerplate notice, with the fields enclosed by brackets "[]"+ replaced with your own identifying information. (Don't include+ the brackets!) The text should be enclosed in the appropriate+ comment syntax for the file format. We also recommend that a+ file or class name and description of purpose be included on the+ same "printed page" as the copyright notice for easier+ identification within third-party archives.++ Copyright [yyyy] [name of copyright owner]++ Licensed under the Apache License, Version 2.0 (the "License");+ you may not use this file except in compliance with the License.+ You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.
+ README.md view
@@ -0,0 +1,16 @@+# pms-infra-cmdrun++`pms-infra-cmdrun` is one of the internal packages that make up the [`pty-mcp-server`](https://github.com/phoityne/pty-mcp-server) project.++`pms-infra-cmdrun` is a package that executes scripts corresponding to tool names published in `tools-list.json`. When an MCP client requests a tool execution, this component locates the matching script, runs it with any given parameters, and returns the output to the client. It enables a flexible server-side tool execution model, allowing clients to trigger predefined commands dynamically without hardcoding logic on the client side. ++---++## Package Structure++---++## Module Structure+++---
+ pms-infra-cmdrun.cabal view
@@ -0,0 +1,138 @@+cabal-version: 3.12+-- The cabal-version field refers to the version of the .cabal specification,+-- and can be different from the cabal-install (the tool) version and the+-- Cabal (the library) version you are using. As such, the Cabal (the library)+-- version used must be equal or greater than the version stated in this field.+-- Starting from the specification version 2.2, the cabal-version field must be+-- the first thing in the cabal file.++-- Initial package description 'pms-infra-cmdrun' generated by+-- 'cabal init'. For further documentation, see:+-- http://haskell.org/cabal/users-guide/+--+-- The name of the package.+name: pms-infra-cmdrun++-- The package version.+-- See the Haskell package versioning policy (PVP) for standards+-- guiding when and how versions should be incremented.+-- https://pvp.haskell.org+-- PVP summary: +-+------- breaking API changes+-- | | +----- non-breaking API additions+-- | | | +--- code changes with no API change+version: 0.0.1.0++-- A short (one-line) description of the package.+synopsis: pms-infra-cmdrun++-- A longer description of the package.+description: README.md++-- The license under which the package is released.+license: Apache-2.0++-- The file containing the license text.+license-file: LICENSE++-- The package author(s).+author: phoityne.hs@gmail.com++-- An email address to which users can send suggestions, bug reports, and patches.+maintainer: phoityne.hs@gmail.com++-- A copyright notice.+copyright: 2025-2026 phoityne.hs@gmail.com+category: AI+build-type: Simple+homepage: https://github.com/phoityne/pms-infra-cmdrun+bug-reports: https://github.com/phoityne/pms-infra-cmdrun/issues++-- Extra doc files to be distributed with the package, such as a CHANGELOG or a README.+extra-doc-files: README.md,+ CHANGELOG.md++-- Extra source files to be distributed with the package, such as examples, or a tutorial module.+-- extra-source-files:+++library+ -- Import common warning flags.+ ghc-options: -Wall -threaded++ -- Modules exported by the library.+ exposed-modules: PMS.Infra.CmdRun.DM.Type,+ PMS.Infra.CmdRun.DS.Utility,+ PMS.Infra.CmdRun.DM.Constant,+ PMS.Infra.CmdRun.App.Control,+ PMS.Infra.CmdRun.DS.Core++ -- Modules included in this library but not exported.+ -- other-modules:++ -- LANGUAGE extensions used by modules in this package.+ -- other-extensions:++ -- Other library packages from which modules are imported.+ build-depends: base ^>=4.21.0.0,+ data-default,+ monad-logger,+ mtl,+ lens,+ text,+ safe-exceptions,+ fast-logger,+ conduit,+ bytestring,+ transformers,+ stm,+ async,+ process,+ filepath,+ aeson,+ directory,+ pms-domain-model++ -- Directories containing source files.+ hs-source-dirs: src++ -- Base language which the package is written in.+ default-language: GHC2021+ default-extensions: LambdaCase++test-suite pms-infra-cmdrun-test+ -- Import common warning flags.+ ghc-options: -Wall -threaded++ -- Base language which the package is written in.+ default-language: GHC2021++ -- Modules included in this executable, other than Main.+ other-modules: PMS.Infra.CmdRun.App.ControlSpec++ -- LANGUAGE extensions used by modules in this package.+ -- other-extensions:++ -- The interface type and version of the test suite.+ type: exitcode-stdio-1.0++ -- Directories containing source files.+ hs-source-dirs: test++ -- The entrypoint to the test suite.+ main-is: Spec.hs++ -- Test dependencies.+ build-depends: base ^>=4.21.0.0,+ hspec,+ hspec-discover,+ data-default,+ stm,+ monad-logger,+ async,+ unix,+ lens,+ pms-domain-model,+ pms-infra-cmdrun++ build-tool-depends:+ hspec-discover:hspec-discover
+ src/PMS/Infra/CmdRun/App/Control.hs view
@@ -0,0 +1,59 @@+module PMS.Infra.CmdRun.App.Control where++import System.IO+import qualified Control.Exception.Safe as E+import System.Log.FastLogger++import qualified PMS.Domain.Model.DM.Type as DM+import qualified PMS.Domain.Model.DS.Utility as DM++import PMS.Infra.CmdRun.DM.Type+import PMS.Infra.CmdRun.DM.Constant+import PMS.Infra.CmdRun.DS.Utility+import PMS.Infra.CmdRun.DS.Core++-- |+--+run :: DM.DomainContext ()+run domDat = do+ hPutStrLn stderr "[INFO] PMS.Infra.CmdRun.App.Control.run called."+ appDat <- defaultAppData+ runWithAppData appDat domDat++-- |+--+runWithAppData :: AppData -> DM.DomainContext ()+runWithAppData appDat domDat = do+ logDat <- DM.createLogger domDat _LOG_FILE_NAME+ runWithLogger logDat appDat domDat++-- |+--+runWithLogger :: (TimedFastLogger, IO ()) -> AppData -> DM.DomainContext ()+runWithLogger (logger, finalizeLogger) appDat domDat = + flip E.catchAny exception+ $ flip E.finally finalize+ $ runApp domDat appDat logger app+ >>= \case+ Right x -> return x+ Left e -> errorEnd e++ where+ finalize = do+ hPutStrLn stderr "-----------------------------------------------------------------------------"+ hPutStrLn stderr "[INFO] PMS.Infra.CmdRun.App.Control.run finalize called."+ finalizeLogger+ hPutStrLn stderr "-----------------------------------------------------------------------------"++ exception e = do+ hPutStrLn stderr "-----------------------------------------------------------------------------"+ hPutStrLn stderr "[ERROR] PMS.Infra.CmdRun.App.Control.run exception occurred."+ hPutStrLn stderr $ show e+ hPutStrLn stderr "-----------------------------------------------------------------------------"+ E.throwIO e++ errorEnd e = do+ hPutStrLn stderr "-----------------------------------------------------------------------------"+ hPutStrLn stderr "[ERROR] PMS.Infra.CmdRun.App.Control.run end with error."+ hPutStrLn stderr $ show e+ hPutStrLn stderr "-----------------------------------------------------------------------------"
+ src/PMS/Infra/CmdRun/DM/Constant.hs view
@@ -0,0 +1,8 @@+module PMS.Infra.CmdRun.DM.Constant where++--------------------------------------------------------------------------------+-- |+--+_LOG_FILE_NAME :: String+_LOG_FILE_NAME = "pms-infra-cmdrun.log"+
+ src/PMS/Infra/CmdRun/DM/Type.hs view
@@ -0,0 +1,49 @@+{-# LANGUAGE TemplateHaskell #-}++module PMS.Infra.CmdRun.DM.Type where++import Control.Monad.Logger+import Control.Monad.Reader+import Control.Monad.Except+import Control.Lens+import Data.Default+import Data.Aeson.TH++import qualified PMS.Domain.Model.DM.Type as DM+import qualified PMS.Domain.Model.DM.TH as DM+++data AppData = AppData {+ }++makeLenses ''AppData++defaultAppData :: IO AppData+defaultAppData = do+ return AppData {+ }++-- |+--+type AppContext = ReaderT AppData (ReaderT DM.DomainData (ExceptT DM.ErrorData (LoggingT IO)))++-- |+--+type IOTask = IO+++--------------------------------------------------------------------------------------------+-- |+--+data StringToolParams =+ StringToolParams {+ _argumentsStringToolParams :: String+ } deriving (Show, Read, Eq)++$(deriveJSON defaultOptions {fieldLabelModifier = DM.dropDataName "StringToolParams", omitNothingFields = True} ''StringToolParams)+makeLenses ''StringToolParams++instance Default StringToolParams where+ def = StringToolParams {+ _argumentsStringToolParams = def+ }
+ src/PMS/Infra/CmdRun/DS/Core.hs view
@@ -0,0 +1,187 @@+{-# LANGUAGE TemplateHaskell #-}+{-# LANGUAGE OverloadedStrings #-}++module PMS.Infra.CmdRun.DS.Core where++import System.IO+import Control.Monad.Logger+import Control.Monad.IO.Class+import Control.Monad.Trans.Class+import Control.Lens+import Control.Monad.Reader+import qualified Control.Concurrent.STM as STM+import Data.Conduit+import qualified Control.Concurrent as CC+import Control.Concurrent.Async+import qualified Data.Text as T+import Control.Monad.Except+import System.Process+import System.FilePath+import Data.Aeson+import qualified Control.Exception.Safe as E+import System.Exit++import qualified PMS.Domain.Model.DM.Type as DM+import qualified PMS.Domain.Model.DM.Constant as DM++import PMS.Infra.CmdRun.DM.Type+import PMS.Infra.CmdRun.DS.Utility+++-- |+--+app :: AppContext ()+app = do+ $logDebugS DM._LOGTAG "app called."+ runConduit pipeline+ where+ pipeline :: ConduitM () Void AppContext ()+ pipeline = src .| cmd2task .| sink++---------------------------------------------------------------------------------+-- |+--+src :: ConduitT () DM.CmdRunCommand AppContext ()+src = lift go >>= yield >> src+ where+ go :: AppContext DM.CmdRunCommand+ go = do+ queue <- view DM.cmdRunQueueDomainData <$> lift ask+ liftIO $ STM.atomically $ STM.readTQueue queue++---------------------------------------------------------------------------------+-- |+--+cmd2task :: ConduitT DM.CmdRunCommand (IOTask ()) AppContext ()+cmd2task = await >>= \case+ Just cmd -> flip catchError errHdl $ do+ lift (go cmd) >>= yield >> cmd2task+ Nothing -> do+ $logWarnS DM._LOGTAG "cmd2task: await returns nothing. skip."+ cmd2task++ where+ errHdl :: String -> ConduitT DM.CmdRunCommand (IOTask ()) AppContext ()+ errHdl msg = do+ $logWarnS DM._LOGTAG $ T.pack $ "cmd2task: exception occurred. skip. " ++ msg+ cmd2task++ go :: DM.CmdRunCommand -> AppContext (IOTask ())+ go (DM.EchoCmdRunCommand dat) = genEchoTask dat+ go (DM.DefaultCmdRunCommand dat) = genCmdRunTask dat++---------------------------------------------------------------------------------+-- |+--+sink :: ConduitT (IOTask ()) Void AppContext ()+sink = await >>= \case+ Just req -> flip catchError errHdl $ do+ lift (go req) >> sink+ Nothing -> do+ $logWarnS DM._LOGTAG "sink: await returns nothing. skip."+ sink++ where+ errHdl :: String -> ConduitT (IOTask ()) Void AppContext ()+ errHdl msg = do+ $logWarnS DM._LOGTAG $ T.pack $ "sink: exception occurred. skip. " ++ msg+ sink++ go :: (IO ()) -> AppContext ()+ go t = do+ $logDebugS DM._LOGTAG "sink: start async."+ _ <- liftIOE $ async t+ $logDebugS DM._LOGTAG "sink: end async."+ return ()++---------------------------------------------------------------------------------+-- |+--+genEchoTask :: DM.EchoCmdRunCommandData -> AppContext (IOTask ())+genEchoTask dat = do+ resQ <- view DM.responseQueueDomainData <$> lift ask+ let val = dat^.DM.valueEchoCmdRunCommandData++ $logDebugS DM._LOGTAG $ T.pack $ "echoTask: echo : " ++ val+ return $ echoTask resQ dat val+++-- |+-- +echoTask :: STM.TQueue DM.McpResponse -> DM.EchoCmdRunCommandData -> String -> IOTask ()+echoTask resQ cmdDat val = flip E.catchAny errHdl $ do+ hPutStrLn stderr $ "[INFO] PMS.Infra.CmdRun.DS.Core.work.echoTask run. " ++ val++ response ExitSuccess val ""++ hPutStrLn stderr "[INFO] PMS.Infra.CmdRun.DS.Core.work.echoTask end."++ where+ errHdl :: E.SomeException -> IO ()+ errHdl e = response (ExitFailure 1) "" (show e)++ response :: ExitCode -> String -> String -> IO ()+ response code outStr errStr = do+ let jsonRpc = cmdDat^.DM.jsonrpcEchoCmdRunCommandData+ content = [ DM.McpToolsCallResponseResultContent "text" outStr+ , DM.McpToolsCallResponseResultContent "text" errStr+ ]+ result = DM.McpToolsCallResponseResult {+ DM._contentMcpToolsCallResponseResult = content+ , DM._isErrorMcpToolsCallResponseResult = (ExitSuccess /= code)+ }+ resDat = DM.McpToolsCallResponseData jsonRpc result+ res = DM.McpToolsCallResponse resDat++ STM.atomically $ STM.writeTQueue resQ res++-- |+--+genCmdRunTask :: DM.DefaultCmdRunCommandData -> AppContext (IOTask ())+genCmdRunTask dat = do+ toolsDir <- view DM.toolsDirDomainData <$> lift ask+ resQ <- view DM.responseQueueDomainData <$> lift ask+ let nameTmp = dat^.DM.nameDefaultCmdRunCommandData+ argsBS = DM.unRawJsonByteString $ dat^.DM.argumentsDefaultCmdRunCommandData+ args <- liftEither $ eitherDecode $ argsBS+ + name <- validateCommand nameTmp+ argsStr <- validateCommandArg $ args^.argumentsStringToolParams++ let cmd = toolsDir </> name ++ ".sh" ++ " " ++ argsStr++ $logDebugS DM._LOGTAG $ T.pack $ "cmdRunTask: system cmd. " ++ cmd+ return $ cmdRunTask resQ dat cmd+++-- |+-- +cmdRunTask :: STM.TQueue DM.McpResponse -> DM.DefaultCmdRunCommandData -> String -> IOTask ()+cmdRunTask resQ cmdDat cmd = flip E.catchAny errHdl $ do+ hPutStrLn stderr $ "[INFO] PMS.Infra.CmdRun.DS.Core.work.cmdRunTask run. " ++ cmd+ let tout = 30 * 1000 * 1000++ race (readCreateProcessWithExitCode (shell cmd) "") (CC.threadDelay tout) >>= \case+ Left (code, out, err) -> response code out err+ Right _ -> E.throwString "timeout occurred."++ hPutStrLn stderr "[INFO] PMS.Infra.CmdRun.DS.Core.work.cmdRunTask end."++ where+ errHdl :: E.SomeException -> IO ()+ errHdl e = response (ExitFailure 1) "" (show e)++ response :: ExitCode -> String -> String -> IO ()+ response code outStr errStr = do+ let jsonRpc = cmdDat^.DM.jsonrpcDefaultCmdRunCommandData+ content = [ DM.McpToolsCallResponseResultContent "text" outStr+ , DM.McpToolsCallResponseResultContent "text" errStr+ ]+ result = DM.McpToolsCallResponseResult {+ DM._contentMcpToolsCallResponseResult = content+ , DM._isErrorMcpToolsCallResponseResult = (ExitSuccess /= code)+ }+ resDat = DM.McpToolsCallResponseData jsonRpc result+ res = DM.McpToolsCallResponse resDat++ STM.atomically $ STM.writeTQueue resQ res
+ src/PMS/Infra/CmdRun/DS/Utility.hs view
@@ -0,0 +1,104 @@+{-# LANGUAGE OverloadedStrings #-}++module PMS.Infra.CmdRun.DS.Utility where++import System.Log.FastLogger+import qualified Control.Exception.Safe as E+import Control.Monad.IO.Class+import Control.Monad.Except+import Control.Monad.Reader+import qualified Data.Text as T+import Data.Char+import Control.Monad++import qualified PMS.Domain.Model.DM.Type as DM+import qualified PMS.Domain.Model.DS.Utility as DM+import PMS.Infra.CmdRun.DM.Type++-- |+--+runApp :: DM.DomainData -> AppData -> TimedFastLogger -> AppContext a -> IO (Either DM.ErrorData a)+runApp domDat appDat logger ctx =+ DM.runFastLoggerT domDat logger+ $ runExceptT+ $ flip runReaderT domDat+ $ runReaderT ctx appDat+++-- |+--+liftIOE :: IO a -> AppContext a+liftIOE f = liftIO (go f) >>= liftEither+ where+ go :: IO b -> IO (Either String b)+ go x = E.catchAny (Right <$> x) errHdl++ errHdl :: E.SomeException -> IO (Either String a)+ errHdl = return . Left . show+++-- |+--+validateCommand :: String -> AppContext String+validateCommand cmd = do+ when (null cmd) $+ throwError "Command is empty."++ when (".." `T.isInfixOf` tcmd) $+ throwError "Command contains directory traversal '..'."++ when ("/" `T.isInfixOf` tcmd) $+ throwError "Command must not contain '/'."++ when ("\\" `T.isInfixOf` tcmd) $+ throwError "Command must not contain '\\'."++ when (any (not . isAllowedChar) cmd) $+ throwError $ "Command contains disallowed characters: " ++ cmd++ return cmd++ where+ tcmd = T.pack cmd+ isAllowedChar c = isAlphaNum c || c `elem` ("-._" :: String)+ ++-- |+--+validateCommandArg :: String -> AppContext String+validateCommandArg arg = do+ let tArg = T.pack arg+ when (hasDangerousChars tArg) $+ throwError $ "Argument contains potentially dangerous characters: " <> arg+ return arg+ where+ hasDangerousChars :: T.Text -> Bool+ hasDangerousChars txt =+ any (`T.isInfixOf` txt) [";", "&&", "|", "$", "`", "<", ">", "\\", "\""]++-- |+--+validateCommandArgs :: [String] -> AppContext [String]+validateCommandArgs = mapM validateCommandArg+++-- |+--+validateMessage :: String -> IO String+validateMessage cmd = do+ when (any (`elem` forbiddenChars) cmd) $+ E.throwString "Command contains forbidden characters."++ case words cmd of+ (firstWord : _) -> when (firstWord `elem` forbiddenCommands) $+ E.throwString "Command is forbidden."+ _ -> return ()++ return cmd+ where+ forbiddenChars :: [Char]+ forbiddenChars = [';', '&', '|', '`']++ forbiddenCommands :: [String]+ forbiddenCommands = ["rm", "mv", "dd", "chmod", "chown", "shutdown", "reboot", "kill", "nc", "telnet", "ssh"]+
+ test/PMS/Infra/CmdRun/App/ControlSpec.hs view
@@ -0,0 +1,103 @@+{-# LANGUAGE TemplateHaskell #-}+{-# LANGUAGE OverloadedStrings #-}++module PMS.Infra.CmdRun.App.ControlSpec (spec) where++import Test.Hspec+import Control.Concurrent.Async+import qualified Control.Concurrent.STM as STM+import Control.Lens+import Data.Default++import qualified PMS.Domain.Model.DM.Type as DM+import qualified PMS.Infra.CmdRun.App.Control as SUT+import qualified PMS.Infra.CmdRun.DM.Type as SUT++-- |+--+data SpecContext = SpecContext {+ _domainDataSpecContext :: DM.DomainData+ , _appDataSpecContext :: SUT.AppData+ }++makeLenses ''SpecContext++defaultSpecContext :: IO SpecContext+defaultSpecContext = do+ domDat <- DM.defaultDomainData+ appDat <- SUT.defaultAppData+ return SpecContext {+ _domainDataSpecContext = domDat+ , _appDataSpecContext = appDat+ }++-- |+--+spec :: Spec+spec = do+ runIO $ putStrLn "Start Spec."+ beforeAll setUpOnce $ + afterAll tearDownOnce . + beforeWith setUp . + after tearDown $ run++-- |+--+setUpOnce :: IO SpecContext+setUpOnce = do+ putStrLn "[INFO] EXECUTED ONLY ONCE BEFORE ALL TESTS START."+ defaultSpecContext++-- |+--+tearDownOnce :: SpecContext -> IO ()+tearDownOnce _ = do+ putStrLn "[INFO] EXECUTED ONLY ONCE AFTER ALL TESTS FINISH."++-- |+--+setUp :: SpecContext -> IO SpecContext+setUp ctx = do+ putStrLn "[INFO] EXECUTED BEFORE EACH TEST STARTS."++ domDat <- DM.defaultDomainData+ appDat <- SUT.defaultAppData+ return ctx {+ _domainDataSpecContext = domDat+ , _appDataSpecContext = appDat+ }++-- |+--+tearDown :: SpecContext -> IO ()+tearDown _ = do+ putStrLn "[INFO] EXECUTED AFTER EACH TEST FINISHES."++-- |+--+run :: SpecWith SpecContext+run = do+ describe "runWithAppData" $ do+ context "when echo command issued." $ do+ it "should call callback" $ \ctx -> do + putStrLn "[INFO] EXECUTING THE FIRST TEST."++ let domDat = ctx^.domainDataSpecContext+ appDat = ctx^.appDataSpecContext+ cmdQ = domDat^.DM.cmdRunQueueDomainData+ resQ = domDat^.DM.responseQueueDomainData+ expect = "abc"+ jsonR = def {DM._jsonrpcJsonRpcRequest = expect}+ argDat = DM.EchoCmdRunCommandData jsonR ""+ args = DM.EchoCmdRunCommand argDat+ + thId <- async $ SUT.runWithAppData appDat domDat++ STM.atomically $ STM.writeTQueue cmdQ args++ (DM.McpToolsCallResponse dat) <- STM.atomically $ STM.readTQueue resQ++ let actual = dat^.DM.jsonrpcMcpToolsCallResponseData^.DM.jsonrpcJsonRpcRequest+ actual `shouldBe` expect++ cancel thId
+ test/Spec.hs view
@@ -0,0 +1,1 @@+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}