mirror of
https://github.com/fullstack-cash/bch-api.git
synced 2026-09-22 09:12:05 -07:00
Merge branch 'master' into 6-electrum-broadcast
This commit is contained in:
Chris Troutner
+49
-49
@@ -22,9 +22,9 @@
|
||||
'use strict'
|
||||
|
||||
const passport = require('passport')
|
||||
const BasicStrategy = require('passport-http').BasicStrategy
|
||||
// const BasicStrategy = require('passport-http').BasicStrategy
|
||||
const AnonymousStrategy = require('passport-anonymous')
|
||||
const wlogger = require('../util/winston-logging')
|
||||
// const wlogger = require('../util/winston-logging')
|
||||
|
||||
// Used for debugging and iterrogating JS objects.
|
||||
const util = require('util')
|
||||
@@ -33,9 +33,9 @@ util.inspect.defaultOptions = { depth: 1 }
|
||||
// let _this
|
||||
|
||||
// Set default rate limit value for testing
|
||||
const PRO_PASSES = process.env.PRO_PASS ? process.env.PRO_PASS : 'BITBOX'
|
||||
// const PRO_PASSES = process.env.PRO_PASS ? process.env.PRO_PASS : 'BITBOX'
|
||||
// Convert the pro-tier password string into an array split by ':'.
|
||||
const PRO_PASS = PRO_PASSES.split(':')
|
||||
// const PRO_PASS = PRO_PASSES.split(':')
|
||||
|
||||
// wlogger.verbose(`PRO_PASS set to: ${PRO_PASS}`)
|
||||
|
||||
@@ -48,55 +48,55 @@ class AuthMW {
|
||||
passport.use(new AnonymousStrategy())
|
||||
|
||||
// Initialize passport for 'basic' authentication.
|
||||
passport.use(
|
||||
new BasicStrategy({ passReqToCallback: true }, function (
|
||||
req,
|
||||
username,
|
||||
password,
|
||||
done
|
||||
) {
|
||||
// console.log(`req: ${util.inspect(req)}`)
|
||||
// console.log(`username: ${username}`)
|
||||
// console.log(`password: ${password}`)
|
||||
|
||||
// Create the req.locals property if it does not yet exist.
|
||||
if (!req.locals) {
|
||||
req.locals = {
|
||||
// default values
|
||||
proLimit: false,
|
||||
apiLevel: 0
|
||||
}
|
||||
}
|
||||
|
||||
// Set pro-tier rate limit to flag to false by default.
|
||||
req.locals.proLimit = false
|
||||
|
||||
// Evaluate the username and password and set the rate limit accordingly.
|
||||
// if (username === "BITBOX" && password === PRO_PASS) {
|
||||
if (username === 'BITBOX') {
|
||||
for (let i = 0; i < PRO_PASS.length; i++) {
|
||||
const thisPass = PRO_PASS[i]
|
||||
|
||||
if (password === thisPass) {
|
||||
wlogger.verbose(`${req.url} called by ${password.slice(0, 6)}`)
|
||||
|
||||
// Success
|
||||
req.locals.proLimit = true
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// console.log(`req.locals: ${util.inspect(req.locals)}`)
|
||||
|
||||
return done(null, true)
|
||||
})
|
||||
)
|
||||
// passport.use(
|
||||
// new BasicStrategy({ passReqToCallback: true }, function (
|
||||
// req,
|
||||
// username,
|
||||
// password,
|
||||
// done
|
||||
// ) {
|
||||
// // console.log(`req: ${util.inspect(req)}`)
|
||||
// // console.log(`username: ${username}`)
|
||||
// // console.log(`password: ${password}`)
|
||||
//
|
||||
// // Create the req.locals property if it does not yet exist.
|
||||
// if (!req.locals) {
|
||||
// req.locals = {
|
||||
// // default values
|
||||
// proLimit: false,
|
||||
// apiLevel: 0
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // Set pro-tier rate limit to flag to false by default.
|
||||
// req.locals.proLimit = false
|
||||
//
|
||||
// // Evaluate the username and password and set the rate limit accordingly.
|
||||
// // if (username === "BITBOX" && password === PRO_PASS) {
|
||||
// if (username === 'BITBOX') {
|
||||
// for (let i = 0; i < PRO_PASS.length; i++) {
|
||||
// const thisPass = PRO_PASS[i]
|
||||
//
|
||||
// if (password === thisPass) {
|
||||
// wlogger.verbose(`${req.url} called by ${password.slice(0, 6)}`)
|
||||
//
|
||||
// // Success
|
||||
// req.locals.proLimit = true
|
||||
// break
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // console.log(`req.locals: ${util.inspect(req.locals)}`)
|
||||
//
|
||||
// return done(null, true)
|
||||
// })
|
||||
// )
|
||||
}
|
||||
|
||||
// Middleware called by the route.
|
||||
mw () {
|
||||
return passport.authenticate(['basic', 'anonymous'], {
|
||||
return passport.authenticate(['anonymous'], {
|
||||
session: false
|
||||
})
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ const redisClient = new Redis(redisOptions)
|
||||
const { RateLimiterRedis } = require('rate-limiter-flexible')
|
||||
const rateLimitOptions = {
|
||||
storeClient: redisClient,
|
||||
points: 100, // Number of points
|
||||
points: 1000, // Number of points
|
||||
duration: 60 // Per minute (per 60 seconds)
|
||||
}
|
||||
|
||||
@@ -98,8 +98,8 @@ class RateLimits {
|
||||
wlogger.debug('No JWT token found!')
|
||||
}
|
||||
|
||||
// Used for displaying error message. Default value is 3.
|
||||
let rateLimit = 3
|
||||
// Used for displaying error message. Default value is 30.
|
||||
let rateLimit = 30
|
||||
|
||||
// Code here for the rate limiter is adapted from this example:
|
||||
// https://github.com/animir/node-rate-limiter-flexible/wiki/Overall-example#authorized-and-not-authorized-users
|
||||
@@ -131,12 +131,15 @@ class RateLimits {
|
||||
origin.toString().indexOf('sandbox.fullstack.cash') > -1 ||
|
||||
origin === 'slp-api')
|
||||
) {
|
||||
pointsToConsume = 1
|
||||
pointsToConsume = 10
|
||||
res.locals.pointsToConsume = pointsToConsume // Feedback for tests.
|
||||
}
|
||||
|
||||
// Apply paid-access rate limits based on key/IP
|
||||
if (key.toString().indexOf('172.17.') > -1) {
|
||||
if (
|
||||
key.toString().indexOf('172.17.') > -1 ||
|
||||
key.toString().indexOf('::ffff:127.0.0.1') > -1
|
||||
) {
|
||||
pointsToConsume = 1
|
||||
res.locals.pointsToConsume = pointsToConsume // Feedback for tests.
|
||||
}
|
||||
@@ -145,7 +148,7 @@ class RateLimits {
|
||||
`User ${key} consuming ${pointsToConsume} point for resource ${resource}.`
|
||||
)
|
||||
|
||||
rateLimit = Math.floor(100 / pointsToConsume)
|
||||
rateLimit = Math.floor(1000 / pointsToConsume)
|
||||
|
||||
// Update the key so that rate limits track both the user and the resource.
|
||||
key = `${key}-${resource}`
|
||||
@@ -175,7 +178,7 @@ class RateLimits {
|
||||
// Calculates the points consumed, based on the jwt information and the route
|
||||
// requested.
|
||||
calcPoints (jwtInfo) {
|
||||
let retVal = 30 // By default, use anonymous tier.
|
||||
let retVal = 300 // By default, use anonymous tier.
|
||||
|
||||
try {
|
||||
// console.log(`jwtInfo: ${JSON.stringify(jwtInfo, null, 2)}`)
|
||||
@@ -192,22 +195,22 @@ class RateLimits {
|
||||
if (jwtInfo.id) {
|
||||
// SLP indexer routes
|
||||
if (level40Routes.includes(resource)) {
|
||||
if (apiLevel >= 40) retVal = 1
|
||||
if (apiLevel >= 40) retVal = 10
|
||||
// else if (apiLevel >= 10) retVal = 10
|
||||
else retVal = 10
|
||||
else retVal = 100
|
||||
|
||||
// Normal indexer routes
|
||||
} else if (level30Routes.includes(resource)) {
|
||||
if (apiLevel >= 30) retVal = 1
|
||||
else retVal = 10
|
||||
if (apiLevel >= 30) retVal = 10
|
||||
else retVal = 100
|
||||
|
||||
// Full node tier
|
||||
} else if (apiLevel >= 20) {
|
||||
retVal = 1
|
||||
retVal = 10
|
||||
|
||||
// Free tier, full node only.
|
||||
} else {
|
||||
retVal = 10
|
||||
retVal = 100
|
||||
}
|
||||
}
|
||||
|
||||
@@ -215,7 +218,7 @@ class RateLimits {
|
||||
} catch (err) {
|
||||
wlogger.error('Error in route-ratelimit.js/calcPoints()')
|
||||
// throw err
|
||||
retVal = 30
|
||||
retVal = 300
|
||||
}
|
||||
|
||||
return retVal
|
||||
|
||||
@@ -13,8 +13,11 @@ const Slpdb = require('./services/slpdb')
|
||||
// const strftime = require('strftime')
|
||||
const wlogger = require('../../util/winston-logging')
|
||||
|
||||
const LOCAL_RESTURL = process.env.LOCAL_RESTURL
|
||||
? process.env.LOCAL_RESTURL
|
||||
: 'https://api.fullstack.cash/v3/'
|
||||
const BCHJS = require('@psf/bch-js')
|
||||
const bchjs = new BCHJS()
|
||||
const bchjs = new BCHJS({ restURL: LOCAL_RESTURL })
|
||||
|
||||
// Used to convert error messages to strings, to safely pass to users.
|
||||
const util = require('util')
|
||||
|
||||
Reference in New Issue
Block a user