Merge pull request #1615 from aladi11isah/feature/1502-1503-ip-scoping-path-payments

Feature/1502 1503 ip scoping path payments

Author: Manuel1234477

src/middleware/apiKey.js

@@ -195,7 +195,7 @@ const requireApiKey = async (req, res, next) => {
         return res.status(403).json({
           success: false,
           error: {
-            code: 'FORBIDDEN',
+            code: 'API_KEY_IP_RESTRICTED',
             message: 'IP address not permitted for this API key',
             requestId: req.id,
             timestamp: new Date().toISOString(),

src/routes/apiKeys.js

@@ -94,7 +94,7 @@ router.post('/', requireAdmin(), apiKeyCreateSchema, payloadSizeLimiter(ENDPOINT
     }
 
     // Validate scopes
-    const scopeValidation = validateScopes(scopes);
+    const scopeValidation = validateScopes(scopes || []);
     if (!scopeValidation.valid) {
       throw new ValidationError(`Invalid scopes: ${scopeValidation.errors.join('; ')}`);
     }

src/routes/donations/create.js

@@ -283,7 +283,7 @@ router.post('/', rotationLockMiddleware(), payloadSizeLimiter(ENDPOINT_LIMITS.si
       return await processCustodialDonation(req, res, next);
     }
 
-    const { amount, currency, donor, recipient, memo, memoType, notes, tags, encryptMemo, anonymous, sourceAsset, sourceAmount } = req.body;
+    const { amount, currency, donor, recipient, memo, memoType, notes, tags, encryptMemo, anonymous, sourceAsset, sourceAmount, sendAsset, receiveAsset, slippageTolerance } = req.body;
 
     if (!amount || !recipient) {
       throw new ValidationError('Missing required fields: amount, recipient', null, ERROR_CODES.MISSING_REQUIRED_FIELD);
@@ -314,6 +314,32 @@ router.post('/', rotationLockMiddleware(), payloadSizeLimiter(ENDPOINT_LIMITS.si
       }
     }
 
+    let normalizedSendAsset = null;
+    let normalizedReceiveAsset = null;
+    let normalizedSlippageTolerance = null;
+    if (sendAsset || receiveAsset) {
+      if (!sendAsset || !receiveAsset) {
+        return res.status(400).json({
+          success: false,
+          error: { code: 'VALIDATION_ERROR', message: 'Both sendAsset and receiveAsset must be provided for cross-asset donations' }
+        });
+      }
+      normalizedSendAsset = parseAssetInput(sendAsset, 'sendAsset');
+      normalizedReceiveAsset = parseAssetInput(receiveAsset, 'receiveAsset');
+
+      if (slippageTolerance !== undefined && slippageTolerance !== null) {
+        if (typeof slippageTolerance !== 'number' || slippageTolerance < 0 || slippageTolerance > 1) {
+          return res.status(400).json({
+            success: false,
+            error: { code: 'VALIDATION_ERROR', message: 'slippageTolerance must be a number between 0 and 1' }
+          });
+        }
+        normalizedSlippageTolerance = slippageTolerance;
+      } else {
+        normalizedSlippageTolerance = 0.01;
+      }
+    }
+
     if (memo || memoType) {
       const memoValidator = require('../../utils/memoValidator');
       const memoValidation = memoValidator.validateWithType(memo || '', memoType || 'text');
@@ -357,6 +383,9 @@ router.post('/', rotationLockMiddleware(), payloadSizeLimiter(ENDPOINT_LIMITS.si
       memo,
       sourceAsset: normalizedSourceAsset,
       sourceAmount: sourceAmountValidation ? sourceAmountValidation.value : undefined,
+      sendAsset: normalizedSendAsset,
+      receiveAsset: normalizedReceiveAsset,
+      slippageTolerance: normalizedSlippageTolerance,
       memoType: memoType || 'text',
       notes,
       tags,

src/routes/donations/helpers.js

@@ -73,7 +73,10 @@ const createDonationSchema = validateSchema({
       notes: { type: 'string', required: false, nullable: true },
       tags: { type: 'array', required: false, nullable: true },
       sourceAsset: { type: 'string', required: false, nullable: true },
-      sourceAmount: { types: ['number', 'numberString'], required: false, nullable: true }
+      sourceAmount: { types: ['number', 'numberString'], required: false, nullable: true },
+      sendAsset: { types: ['string', 'object'], required: false, nullable: true },
+      receiveAsset: { types: ['string', 'object'], required: false, nullable: true },
+      slippageTolerance: { type: 'number', required: false, nullable: true }
     }
   }
 });

src/scripts/manageApiKeys.js

@@ -22,6 +22,9 @@ const commands = {
     const name = args.name;
     const role = args.role || 'user';
     const expiresInDays = args.expires ? parseInt(args.expires, 10) : undefined;
+    const allowedIps = args['allowed-ips']
+      ? args['allowed-ips'].split(',').map(ip => ip.trim()).filter(ip => ip)
+      : null;
 
     if (!name) {
       console.error('Error: --name is required');
@@ -38,7 +41,8 @@ const commands = {
       role,
       expiresInDays,
       createdBy: 'cli',
-      metadata: { createdVia: 'cli' }
+      metadata: { createdVia: 'cli' },
+      allowedIps,
     });
 
     console.log('\n✓ API Key created successfully!\n');
@@ -52,6 +56,9 @@ const commands = {
     if (keyInfo.expiresAt) {
       console.log('Expires:', new Date(keyInfo.expiresAt).toISOString());
     }
+    if (keyInfo.allowedIps && keyInfo.allowedIps.length > 0) {
+      console.log('Allowed IPs:', keyInfo.allowedIps.join(', '));
+    }
     console.log('\n⚠️  IMPORTANT: Store this key securely. It will not be shown again.\n');
   },
 
@@ -149,6 +156,8 @@ Commands:
     --name <string>       Key name (required)
     --role <string>       Role: admin, user, guest (default: user)
     --expires <number>    Expiration in days (optional)
+    --allowed-ips <ips>   Comma-separated IP addresses/CIDR ranges (optional)
+                          Example: "192.168.1.0/24,10.0.0.1"
 
   list        List all API keys
     --status <string>     Filter by status: active, deprecated, revoked
@@ -167,6 +176,7 @@ Commands:
 
 Examples:
   node src/scripts/manageApiKeys.js create --name "Production API" --role admin --expires 365
+  node src/scripts/manageApiKeys.js create --name "Office API" --role user --allowed-ips "192.168.1.0/24,10.0.0.1"
   node src/scripts/manageApiKeys.js list --status active
   node src/scripts/manageApiKeys.js deprecate --id 1
   node src/scripts/manageApiKeys.js revoke --id 2

src/services/DonationService.js

@@ -710,6 +710,9 @@ class DonationService {
     anonymous = false,
     sourceAsset,
     sourceAmount,
+    sendAsset,
+    receiveAsset,
+    slippageTolerance,
     validAfter = 0,
     validBefore = 0,
     memoEnvelope = null,
@@ -801,11 +804,22 @@ class DonationService {
     }
 
     const sourceAssetProvided = sourceAsset !== undefined && sourceAsset !== null;
-    const normalizedDestAsset = DEFAULT_DESTINATION_ASSET;
-    const normalizedSourceAsset = sourceAssetProvided
+    const sendAssetProvided = sendAsset !== undefined && sendAsset !== null;
+    const receiveAssetProvided = receiveAsset !== undefined && receiveAsset !== null;
+
+    let normalizedDestAsset = DEFAULT_DESTINATION_ASSET;
+    let normalizedSourceAsset = sourceAssetProvided
       ? parseAssetInput(sourceAsset, 'sourceAsset')
       : normalizedDestAsset;
+
+    // Handle sendAsset/receiveAsset for path payment donations
+    if (sendAssetProvided && receiveAssetProvided) {
+      normalizedSourceAsset = parseAssetInput(sendAsset, 'sendAsset');
+      normalizedDestAsset = parseAssetInput(receiveAsset, 'receiveAsset');
+    }
+
     const normalizedSourceAmount = sourceAmount ?? xlmAmount;
+    const normalizedSlippageTolerance = slippageTolerance ?? 0.01;
     const sourceSecret = this.resolvePaymentSourceSecret(sanitizedDonor);
     let stellarResult = null;
     let paymentMethod = 'record_only';
@@ -815,12 +829,15 @@ class DonationService {
 
     if (sourceSecret && sanitizedRecipient) {
       await this.checkRecipientAccountExists(sanitizedRecipient);
-      if (!sourceAssetProvided) {
+
+      const isPathPayment = sourceAssetProvided || (sendAssetProvided && receiveAssetProvided && !isSameAsset(normalizedSourceAsset, normalizedDestAsset));
+
+      if (!isPathPayment) {
         // Set correlation ID on StellarService for this request
         if (correlationId) {
           this.stellarService.setCorrelationId(correlationId);
         }
-        
+
         stellarResult = await this.stellarService.sendDonation({
           sourceSecret,
           destinationPublic: sanitizedRecipient,
@@ -837,6 +854,11 @@ class DonationService {
           this.stellarService.setCorrelationId(correlationId);
         }
 
+        // Set correlation ID on StellarService for this request
+        if (correlationId) {
+          this.stellarService.setCorrelationId(correlationId);
+        }
+
         const estimate = await this.stellarService.discoverBestPath({
           sourceAsset: normalizedSourceAsset,
           sourceAmount: normalizedSourceAmount.toString(),
@@ -851,12 +873,16 @@ class DonationService {
         selectedPath = estimate.path || [];
         conversionRate = estimate.conversionRate;
 
+        // Apply slippage tolerance to minimum destination amount
+        const estimatedDestAmount = parseFloat(estimate.destAmount);
+        const minDestAmount = estimatedDestAmount * (1 - normalizedSlippageTolerance);
+
         try {
           stellarResult = await this.stellarService.pathPayment(
             normalizedSourceAsset,
             normalizedSourceAmount.toString(),
             normalizedDestAsset,
-            estimate.destAmount,
+            minDestAmount.toString(),
             selectedPath,
             {
               sourceSecret,

tests/security/ip-allowlist.test.js

@@ -189,7 +189,7 @@ describe('IP allowlist middleware integration', () => {
     });
     const res = await request(app).get('/health').set('x-api-key', key);
     expect(res.status).toBe(403);
-    expect(res.body.error.code).toBe('FORBIDDEN');
+    expect(res.body.error.code).toBe('API_KEY_IP_RESTRICTED');
   });
 
   it('allows requests matching a CIDR range that includes loopback', async () => {