monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-11-16 15:58:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

openalias: handle address validation correctly

Browse source
This commit is contained in:
mmbyday 2018-12-19 13:37:52 -08:00
parent 7c0a557e62
commit 67787421e1
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/InputMulti.qml
View file

@ -55,7 +55,7 @@ TextArea {
if(addressValidation){ if(addressValidation){
// js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }` // js replacement for `RegExpValidator { regExp: /[0-9A-Fa-f]{95}/g }`
textArea.text = textArea.text.replace(/[^a-z0-9.@]/gi,''); textArea.text = textArea.text.replace(/[^a-z0-9.@]/gi,'');
var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype); var address_ok = TxUtils.checkAddress(textArea.text, appWindow.persistentSettings.nettype) || TxUtils.isValidOpenAliasAddress(textArea.text);
if(!address_ok) error = true; if(!address_ok) error = true;
else error = false; else error = false;
TextArea.cursorPosition = textArea.text.length; TextArea.cursorPosition = textArea.text.length;

8
js/TxUtils.js
View file

@ -56,3 +56,11 @@ function checkSignature(signature) {
return false; return false;
} }
function isValidOpenAliasAddress(address) {
address = address.trim()
var dot = address.indexOf('.')
if (dot < 0)
return false
// we can get an awful lot of valid domains, including non ASCII chars... accept anything
return true
}

14
pages/Transfer.qml
View file

@ -35,6 +35,7 @@ import moneroComponents.Wallet 1.0
import "../components" import "../components"
import "../components" as MoneroComponents import "../components" as MoneroComponents
import "." 1.0 import "." 1.0
import "../js/TxUtils.js" as TxUtils
Rectangle { Rectangle {
@ -51,15 +52,6 @@ Rectangle {
Clipboard { id: clipboard } Clipboard { id: clipboard }
function isValidOpenAliasAddress(address) {
address = address.trim()
var dot = address.indexOf('.')
if (dot < 0)
return false
// we can get an awful lot of valid domains, including non ASCII chars... accept anything
return true
}
function oa_message(text) { function oa_message(text) {
oaPopup.title = qsTr("OpenAlias error") + translationManager.emptyString oaPopup.title = qsTr("OpenAlias error") + translationManager.emptyString
oaPopup.text = text oaPopup.text = text
@ -249,8 +241,8 @@ Rectangle {
id: resolveButton id: resolveButton
width: 80 width: 80
text: qsTr("Resolve") + translationManager.emptyString text: qsTr("Resolve") + translationManager.emptyString
visible: isValidOpenAliasAddress(addressLine.text) visible: TxUtils.isValidOpenAliasAddress(addressLine.text)
enabled : isValidOpenAliasAddress(addressLine.text) enabled : visible
onClicked: { onClicked: {
var result = walletManager.resolveOpenAlias(addressLine.text) var result = walletManager.resolveOpenAlias(addressLine.text)
if (result) { if (result) {