[#92] nns: Mention domain in panic messages
Signed-off-by: Ekaterina Lebedeva <ekaterina.lebedeva@yadro.com>
parent
ba4ef7bd22
commit
4e2882394c
|
@ -220,9 +220,6 @@ func GetPrice() int {
|
|||
// IsAvailable checks whether the provided domain name is available.
|
||||
func IsAvailable(name string) bool {
|
||||
fragments := splitAndCheck(name)
|
||||
if fragments == nil {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
ctx := storage.GetReadOnlyContext()
|
||||
l := len(fragments)
|
||||
if storage.Get(ctx, append([]byte{prefixRoot}, []byte(fragments[l-1])...)) == nil {
|
||||
|
@ -267,10 +264,6 @@ func parentExpired(ctx storage.Context, fragments []string) string {
|
|||
// Register registers a new domain with the specified owner and name if it's available.
|
||||
func Register(name string, owner interop.Hash160, email string, refresh, retry, expire, ttl int) bool {
|
||||
fragments := splitAndCheck(name)
|
||||
if fragments == nil {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
|
||||
l := len(fragments)
|
||||
tldKey := append([]byte{prefixRoot}, []byte(fragments[l-1])...)
|
||||
ctx := storage.GetContext()
|
||||
|
@ -339,9 +332,7 @@ func Register(name string, owner interop.Hash160, email string, refresh, retry,
|
|||
|
||||
// Renew increases domain expiration date.
|
||||
func Renew(name string) int64 {
|
||||
if len(name) > maxDomainNameLength {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
checkDomainNameLength(name)
|
||||
runtime.BurnGas(GetPrice())
|
||||
ctx := storage.GetContext()
|
||||
ns := getNameState(ctx, []byte(name))
|
||||
|
@ -353,9 +344,7 @@ func Renew(name string) int64 {
|
|||
|
||||
// UpdateSOA updates soa record.
|
||||
func UpdateSOA(name, email string, refresh, retry, expire, ttl int) {
|
||||
if len(name) > maxDomainNameLength {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
checkDomainNameLength(name)
|
||||
ctx := storage.GetContext()
|
||||
ns := getNameState(ctx, []byte(name))
|
||||
ns.checkAdmin()
|
||||
|
@ -364,9 +353,7 @@ func UpdateSOA(name, email string, refresh, retry, expire, ttl int) {
|
|||
|
||||
// SetAdmin updates domain admin.
|
||||
func SetAdmin(name string, admin interop.Hash160) {
|
||||
if len(name) > maxDomainNameLength {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
checkDomainNameLength(name)
|
||||
if admin != nil && !runtime.CheckWitness(admin) {
|
||||
panic("not witnessed by admin")
|
||||
}
|
||||
|
@ -722,20 +709,28 @@ func isAlNum(c uint8) bool {
|
|||
|
||||
// splitAndCheck splits domain name into parts and validates it.
|
||||
func splitAndCheck(name string) []string {
|
||||
l := len(name)
|
||||
if l < minDomainNameLength || maxDomainNameLength < l {
|
||||
return nil
|
||||
}
|
||||
checkDomainNameLength(name)
|
||||
fragments := std.StringSplit(name, ".")
|
||||
l = len(fragments)
|
||||
l := len(fragments)
|
||||
for i := 0; i < l; i++ {
|
||||
if !checkFragment(fragments[i], i == l-1) {
|
||||
return nil
|
||||
panic(getDomainNamePanicMessage(name, "invalid fragment '"+fragments[i]+"'"))
|
||||
}
|
||||
}
|
||||
return fragments
|
||||
}
|
||||
|
||||
// checkDomainNameLength panics if name is out of boundaries
|
||||
func checkDomainNameLength(name string) {
|
||||
l := len(name)
|
||||
if l > maxDomainNameLength {
|
||||
panic(getDomainNamePanicMessage(name, "domain name too long: got = "+std.Itoa(len(name), 10)+", max = "+std.Itoa(maxDomainNameLength, 10)))
|
||||
}
|
||||
if l < minDomainNameLength {
|
||||
panic(getDomainNamePanicMessage(name, "domain name too short: got = "+std.Itoa(len(name), 10)+", min = "+std.Itoa(minDomainNameLength, 10)))
|
||||
}
|
||||
}
|
||||
|
||||
// checkIPv4 checks record on IPv4 compliance.
|
||||
func checkIPv4(data string) bool {
|
||||
l := len(data)
|
||||
|
@ -849,9 +844,6 @@ func checkIPv6(data string) bool {
|
|||
// tokenIDFromName returns token ID (domain.root) from the provided name.
|
||||
func tokenIDFromName(name string) string {
|
||||
fragments := splitAndCheck(name)
|
||||
if fragments == nil {
|
||||
panic("invalid domain name format")
|
||||
}
|
||||
|
||||
ctx := storage.GetReadOnlyContext()
|
||||
sum := 0
|
||||
|
@ -910,3 +902,13 @@ func getAllRecords(ctx storage.Context, name string) iterator.Iterator {
|
|||
recordsKey := getRecordsKey(tokenID, name)
|
||||
return storage.Find(ctx, recordsKey, storage.ValuesOnly|storage.DeserializeValues)
|
||||
}
|
||||
|
||||
// getDomainNamePanicMessage returns panic message for invalid domain name containing
|
||||
// mentioned domain name
|
||||
func getDomainNamePanicMessage(name string, problem string) string {
|
||||
msg := "invalid domain name format: '" + name + "'"
|
||||
if problem != "" {
|
||||
msg += ": " + problem
|
||||
}
|
||||
return msg
|
||||
}
|
||||
|
|
|
@ -54,6 +54,9 @@ func TestNNSRegisterTLD(t *testing.T) {
|
|||
c.InvokeFail(t, "invalid domain name format", "register",
|
||||
"0com", c.CommitteeHash,
|
||||
"email@frostfs.info", refresh, retry, expire, ttl)
|
||||
c.InvokeFail(t, "invalid fragment '0com'", "register",
|
||||
"0com", c.CommitteeHash,
|
||||
"email@frostfs.info", refresh, retry, expire, ttl)
|
||||
|
||||
acc := c.NewAccount(t)
|
||||
cAcc := c.WithSigners(acc)
|
||||
|
@ -69,6 +72,12 @@ func TestNNSRegisterTLD(t *testing.T) {
|
|||
c.InvokeFail(t, "invalid domain name format", "register",
|
||||
"x", c.CommitteeHash,
|
||||
"email@frostfs.info", refresh, retry, expire, ttl)
|
||||
c.InvokeFail(t, "domain name too short", "register",
|
||||
"x", c.CommitteeHash,
|
||||
"email@frostfs.info", refresh, retry, expire, ttl)
|
||||
c.InvokeFail(t, "domain name too long", "register",
|
||||
getTooLongDomainName(255), c.CommitteeHash,
|
||||
"email@frostfs.info", refresh, retry, expire, ttl)
|
||||
})
|
||||
|
||||
c.Invoke(t, true, "register",
|
||||
|
@ -101,9 +110,17 @@ func TestNNSRegister(t *testing.T) {
|
|||
c3.InvokeFail(t, "invalid domain name format", "register",
|
||||
"-testdomain.com", acc.ScriptHash(),
|
||||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
c3.InvokeFail(t, "invalid fragment '-testdomain'", "register",
|
||||
"-testdomain.com", acc.ScriptHash(),
|
||||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
|
||||
c3.InvokeFail(t, "invalid domain name format", "register",
|
||||
"testdomain-.com", acc.ScriptHash(),
|
||||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
c3.InvokeFail(t, "invalid fragment 'testdomain-'", "register",
|
||||
"testdomain-.com", acc.ScriptHash(),
|
||||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
|
||||
c3.Invoke(t, true, "register",
|
||||
"test-domain.com", acc.ScriptHash(),
|
||||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
|
@ -358,6 +375,8 @@ func TestNNSIsAvailable(t *testing.T) {
|
|||
"myemail@frostfs.info", refresh, retry, expire, ttl)
|
||||
c.Invoke(t, false, "isAvailable", "dom.domain.com")
|
||||
c.Invoke(t, true, "isAvailable", "dom.dom.domain.com")
|
||||
|
||||
c.InvokeFail(t, "domain name too long", "isAvailable", getTooLongDomainName(255))
|
||||
}
|
||||
|
||||
func TestNNSRenew(t *testing.T) {
|
||||
|
@ -382,6 +401,8 @@ func TestNNSRenew(t *testing.T) {
|
|||
{Key: stackitem.Make("expiration"), Value: stackitem.Make(ts)},
|
||||
})
|
||||
cAcc.Invoke(t, expected, "properties", "testdomain.com")
|
||||
c.InvokeFail(t, "domain name too long", "renew", getTooLongDomainName(255))
|
||||
|
||||
}
|
||||
|
||||
func TestNNSResolve(t *testing.T) {
|
||||
|
@ -431,3 +452,11 @@ func TestNNSAndProxy(t *testing.T) {
|
|||
checkBalance(t, c.CommitteeHash, 1)
|
||||
})
|
||||
}
|
||||
|
||||
func getTooLongDomainName(max int) (res string) {
|
||||
for len(res) < max {
|
||||
res += "dom."
|
||||
}
|
||||
res += "com"
|
||||
return res
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue