Skip to content

fix(mu,scheduler-utils): fix whitelist blocking and bundled process l… #1302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Lucifer0x17 wants to merge 1 commit into from
Closed

fix(mu,scheduler-utils): fix whitelist blocking and bundled process l… #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions scheduler-utils/src/client/gateway.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ export function loadProcessSchedulerWith ({ fetch, GRAPHQL_URL, GRAPHQL_MAX_RETR
query GetTransactions ($transactionIds: [ID!]!) {
transactions(
ids: $transactionIds
tags: [
{ name: "Data-Protocol", values: ["ao"] }
]
) {
edges {
node {
Expand Down Expand Up @@ -178,6 +175,12 @@ export function loadProcessSchedulerWith ({ fetch, GRAPHQL_URL, GRAPHQL_MAX_RETR
return gateway({ query: GET_TRANSACTIONS_QUERY, variables: { transactionIds: [process] } })
.then(path(['data', 'transactions', 'edges', '0', 'node']))
.then(findTransactionTags(`Process ${process} was not found on gateway`))
.then((tags) => {
if (findTagValue('Data-Protocol')(tags) !== 'ao') {
throw new TransactionNotFoundError(`Process ${process} is not an ao process`)
}
return tags
})
.then(findTagValue(SCHEDULER_TAG))
.then((walletAddress) => {
if (!walletAddress) throw new SchedulerTagNotFoundError('No "Scheduler" tag found on process')
Expand Down
2 changes: 1 addition & 1 deletion servers/mu/src/domain/api/sendDataItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ export function sendDataItemWith ({
.chain(({ isMessage }) => {
if (isMessage) {
const whitelist = fetchProcessWhitelist ? fetchProcessWhitelist() : {}
if (whitelist && !whitelist[ctx.dataItem.target]) {
if (whitelist && Object.keys(whitelist).length > 0 && !whitelist[ctx.dataItem.target]) {
const error = new Error('Forbidden, process not whitelisted')
error.status = 403
return Rejected(error)
Expand Down
Loading