administrate-mcp 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22f6f3b6febbe8e86b8cb721e30f63e4e9232edbd668a3a311e44ff180b9117
-  data.tar.gz: cd60a0dad70e15f8235e1ed6c3c2385b5d8cc56efe2a66e1b84a18b3b5fe4087
+  metadata.gz: f3f38d54e63d5f8d6b88750c73f284d10d5e0500a0a7f47cae82556be264e8fe
+  data.tar.gz: 1b1d5fda201d08915bdddd2c6eb92fb97f9698ece7f17cbff1a1d563f280eea9
 SHA512:
-  metadata.gz: 65ea611de7b893d7b4aaec605cc91a3bd742187ca3ff2ef340229009daa130a7bc7abb79e1f4bda2d4995670ff0dadfce95252f659366ada2713458a4d70a60c
-  data.tar.gz: 23a0677acecdb975efeb760a6f797f9319e0ae95b607be57db1dd5a5be5c1db21141aaa3cfcfbf90625472059b65a3263ae8b10ec0ab00d002414e19d5c67215
+  metadata.gz: bdc5883ed9f4d6cadab89dd8be6aca8f890e25cfc39d0a40ef6b2b7e9fd6b11af6de5e817d4d8c6047a0bcd9d3ad1a6bd05b4af095bd64c256ad6d65198bbf7e
+  data.tar.gz: 21bd4c4e668bad2bd5d9050bc6e86abae5800a605be3604d2683687bb3b52bcf4dae42cc2423f5df2fe09713ac14784cc5188a5d76ba28694fe2f41581fa895e

data/CHANGELOG.md

@@ -8,6 +8,27 @@ minor release may change behaviour a host depends on; the entry says so when it
 
 ## [Unreleased]
 
+## [0.3.1] - 2026-10-20
+
+### Security
+
+- A `tools/call` argument named `admin` no longer replaces the authenticated admin passed to a
+  tool's `execute` and to `mcp_action` blocks
+  ([GHSA-vv7c-hhjc-fhq8](https://github.com/sorare/administrate-mcp/security/advisories/GHSA-vv7c-hhjc-fhq8)).
+  The call is now refused with a tool error. For built-in and host-defined tools, the refusal comes
+  after the scope and role checks, and the `on_tool_call` hook still reports the call under the
+  authenticated admin, with the refused argument in `arguments`. The tools generated from
+  `mcp_action` refuse it while validating arguments, before the hook runs.
+
+### Changed
+
+- **Behaviour change for hosts:** a tool that declares an input property named `admin` now raises
+  `ArgumentError` when its class is loaded, and an `mcp_action` param named `admin` or `id` raises
+  `ArgumentError` when the dashboard is loaded. Rename the property or param.
+- **Behaviour change for clients:** the tools generated from `mcp_action` declarations now reject
+  arguments they do not declare, with an `Invalid arguments` tool error, instead of passing them to
+  the block in `params`.
+
 ## [0.3.0] - 2026-10-02
 
 ### Changed
@@ -117,7 +138,8 @@ minor release may change behaviour a host depends on; the entry says so when it
   took the gem from git before 0.1.0 must reinstall its migrations rather than migrate
   incrementally.
 
-[Unreleased]: https://github.com/sorare/administrate-mcp/compare/v0.3.0...HEAD
+[Unreleased]: https://github.com/sorare/administrate-mcp/compare/v0.3.1...HEAD
+[0.3.1]: https://github.com/sorare/administrate-mcp/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/sorare/administrate-mcp/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/sorare/administrate-mcp/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/sorare/administrate-mcp/releases/tag/v0.1.0

data/app/lib/administrate/mcp/actions.rb

@@ -27,6 +27,8 @@ module Administrate
           keyword_init: true
         )
 
+      RESERVED_PARAMS = %i[admin id].freeze
+
       class << self
         # Normalizes the arguments of a `mcp_action` declaration into a spec (everything but the
         # model, which is inferred from the owning dashboard when definitions are built).
@@ -34,6 +36,7 @@ module Administrate
                        destructive: true, &invoke)
           raise ArgumentError, "#{name}: a block is required to invoke the action" unless invoke
 
+          reject_reserved_params!(name, params)
           normalized = normalize_params(params)
 
           {
@@ -97,6 +100,11 @@ module Administrate
 
         private
 
+        def reject_reserved_params!(name, params)
+          reserved = RESERVED_PARAMS & params.keys.map(&:to_sym)
+          raise ArgumentError, "#{name}: reserved param name(s): #{reserved.join(', ')}" if reserved.any?
+        end
+
         def authorized_for_discovery?(admin, definition)
           Administrate::MCP.config.authorization.authorized?(admin, definition.model_class, definition.predicate)
         rescue StandardError
@@ -130,7 +138,7 @@ module Administrate
           def schema_for(defn, resource)
             properties = { id: { type: 'string', description: "ID or slug of the #{resource}" } }
             defn.params.each { |name, spec| properties[name] = spec }
-            { properties:, required: %w[id] + defn.required.map(&:to_s) }
+            { properties:, required: %w[id] + defn.required.map(&:to_s), additionalProperties: false }
           end
 
           # Replaces the role-based default with instance-level authorization on the loaded record.

data/app/lib/administrate/mcp/base_tool.rb

@@ -8,7 +8,14 @@ module Administrate
       ResourceForbiddenError = Administrate::MCP::ResourceForbiddenError
       InvalidArgumentError = Administrate::MCP::InvalidArgumentError
 
+      RESERVED_ARGUMENTS = %i[admin].freeze
+
       class << self
+        def input_schema(value = NOT_SET)
+          reject_reserved_properties!(value) if value.is_a?(Hash)
+          super
+        end
+
         def requires_roles(*roles)
           @required_roles = roles.flatten
         end
@@ -47,7 +54,21 @@ module Administrate
           check_scopes!(server_context)
           check_roles!(admin, **args)
           audit!(admin, args, server_context)
-          execute(admin:, **args)
+          reject_reserved_arguments!(args)
+          execute(**args, admin:)
+        end
+
+        def reject_reserved_arguments!(args)
+          reserved = args.keys & RESERVED_ARGUMENTS
+          return if reserved.empty?
+
+          raise InvalidArgumentError, "Reserved argument(s) cannot be passed: #{reserved.join(', ')}"
+        end
+
+        def reject_reserved_properties!(schema)
+          properties = (schema[:properties] || schema['properties'] || {}).keys.map(&:to_sym)
+          reserved = properties & RESERVED_ARGUMENTS
+          raise ArgumentError, "#{name}: reserved input property name(s): #{reserved.join(', ')}" if reserved.any?
         end
 
         def check_scopes!(server_context)

data/lib/administrate/mcp/version.rb

@@ -2,6 +2,6 @@
 
 module Administrate
   module MCP
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: administrate-mcp
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sorare