fix(PE-6981): disallow names that look like wallet addresses (#155)

ar-io · Oct 30, 2024 · 65c97f5 · 65c97f5
2 parents 87f5bc2 + ea0532b
commit 65c97f5
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 12 deletions.
diff --git a/spec/arns_spec.lua b/spec/arns_spec.lua
@@ -1,7 +1,6 @@
 local testProcessId = "NdZ3YRwMB2AMwwFYjKn1g88Y9nRybTo0qhS1ORq_E7g"
 local constants = require("constants")
 local arns = require("arns")
-local balances = require("balances")
 local demand = require("demand")
 local utils = require("utils")
 local Auction = require("auctions")
@@ -58,9 +57,9 @@ describe("arns", function()
 							startTimestamp = 0,
 							endTimestamp = timestamp + constants.oneYearMs * 1,
 						},
-					}, arns.getRecords())
-					assert.are.equal(_G.Balances[testAddress], startBalance - 600000000)
-					assert.are.equal(balances.getBalance(_G.ao.id), 600000000)
+					}, _G.NameRegistry.records)
+					assert.are.equal(startBalance - 600000000, _G.Balances[testAddress])
+					assert.are.equal(600000000, _G.Balances[_G.ao.id])
 					assert.are.equal(demandBefore + 600000000, demand.getCurrentPeriodRevenue())
 					assert.are.equal(purchasesBefore + 1, demand.getCurrentPeriodPurchases())
 				end
@@ -147,7 +146,7 @@ describe("arns", function()
 					pcall(arns.buyRecord, "test-name", "lease", 1, testAddress, timestamp, testProcessId)
 				assert.is_false(status)
 				assert.match("Name is reserved", result)
-				assert.are.same({}, arns.getRecords())
+				assert.are.same({}, _G.NameRegistry.records)
 				assert.are.same(reservedName, _G.NameRegistry.reserved["test-name"])
 			end)
 
@@ -170,7 +169,7 @@ describe("arns", function()
 				}
 				assert.is_true(status)
 				assert.are.same(expectation, result.record)
-				assert.are.same({ ["test-name"] = expectation }, arns.getRecords())
+				assert.are.same({ ["test-name"] = expectation }, _G.NameRegistry.records)
 
 				assert.is.equal(
 					_G.Balances[testAddress],
@@ -194,7 +193,26 @@ describe("arns", function()
 					pcall(arns.buyRecord, "test-name", "lease", 1, testAddress, timestamp, testProcessId)
 				assert.is_false(status)
 				assert.match("Insufficient balance", result)
-				assert.are.same({}, arns.getRecords())
+				assert.are.same({}, _G.NameRegistry.records)
+			end)
+
+			it("should throw an error if the name is in auction [" .. addressType .. "]", function()
+				_G.NameRegistry.auctions["test-name"] = {
+					endTimestamp = timestamp + constants.oneYearMs,
+				}
+				local status, result =
+					pcall(arns.buyRecord, "test-name", "lease", 1, testAddress, timestamp, testProcessId)
+				assert.is_false(status)
+				assert.match("Name is in auction", result)
+				assert.are.same({}, _G.NameRegistry.records)
+			end)
+
+			it("should throw an error if the name looks like a wallet address [" .. addressType .. "]", function()
+				local status, result =
+					pcall(arns.buyRecord, testAddress, "lease", 1, testAddress, timestamp, testProcessId)
+				assert.is_false(status)
+				assert.match("Name cannot be a wallet address", result)
+				assert.are.same({}, _G.NameRegistry.records)
 			end)
 		end)
 
@@ -258,7 +276,7 @@ describe("arns", function()
 				}
 				assert.is_true(status)
 				assert.are.same(expectation, result.record)
-				assert.are.same({ ["test-name"] = expectation }, arns.getRecords())
+				assert.are.same({ ["test-name"] = expectation }, _G.NameRegistry.records)
 
 				assert.is.equal(
 					_G.Balances[testAddress],
@@ -368,7 +386,7 @@ describe("arns", function()
 						type = "lease",
 						undernameLimit = 10,
 					},
-				}, arns.getRecords())
+				}, _G.NameRegistry.records)
 
 				assert.is.equal(
 					_G.Balances[testAddress],

diff --git a/src/arns.lua b/src/arns.lua
@@ -44,6 +44,10 @@ function arns.buyRecord(name, purchaseType, years, from, timestamp, processId)
 		error("Name is reserved")
 	end
 
+	if arns.getAuction(name) then
+		error("Name is in auction")
+	end
+
 	local newRecord = {
 		processId = processId,
 		startTimestamp = timestamp,

diff --git a/src/main.lua b/src/main.lua
@@ -362,7 +362,10 @@ addEventingHandler(ActionMap.Transfer, utils.hasMatchingTag("Action", ActionMap.
 	local shouldContinue = eventingPcall(msg.ioEvent, function(error)
 		ao.send({
 			Target = msg.From,
-			Tags = { Action = ActionMap.Transfer .. "-Notice", Error = "Transfer-Error" },
+			Tags = {
+				Action = "Invalid-" .. ActionMap.Transfer .. "-Notice",
+				Error = "Bad-Input",
+			},
 			Data = tostring(error),
 		})
 	end, checkAssertions)
@@ -378,7 +381,7 @@ addEventingHandler(ActionMap.Transfer, utils.hasMatchingTag("Action", ActionMap.
 	local shouldContinue2, result = eventingPcall(msg.ioEvent, function(error)
 		ao.send({
 			Target = msg.From,
-			Tags = { Action = ActionMap.Transfer .. "-Notice", Error = "Transfer-Error" },
+			Tags = { Action = "Invalid-" .. ActionMap.Transfer .. "-Notice", Error = "Transfer-Error" },
 			Data = tostring(error),
 		})
 	end, balances.transfer, recipient, from, quantity)
@@ -735,7 +738,7 @@ addEventingHandler(ActionMap.BuyRecord, utils.hasMatchingTag("Action", ActionMap
 		ao.send({
 			Target = msg.From,
 			Tags = {
-				Action = ActionMap.BuyRecord .. "-Notice",
+				Action = "Invalid-" .. ActionMap.BuyRecord .. "-Notice",
 				Error = "Invalid-" .. ActionMap.BuyRecord,
 			},
 			Data = tostring(error),