nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix hostname validator not dealing with whitespace, port no's.

Browse source
This commit is contained in:
Michael Gratton 2018-09-05 23:37:57 +10:00 • committed by Michael James Gratton
parent 370aefd285
commit a0c3754042
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/client/components/components-validator.vala
View file

@ -358,44 +358,44 @@ public class Components.NetworkAddressValidator : Validator {
this.cancellable.cancel();
}
Validator.Validity ret = this.state;
GLib.NetworkAddress? address = null;
try {
address = GLib.NetworkAddress.parse(value, this.default_port);
address = GLib.NetworkAddress.parse(
value.strip(), this.default_port
);
} catch (GLib.Error err) {
this.validated_address = null;
ret = Validator.Validity.INVALID;
debug("Error parsing host name \"%s\": %s", value, err.message);
}
Validator.Validity ret = this.state;
if (address != null) {
// Only re-validate if changed
if (this.validated_address == null ||
// Only re-validate if changed
if (address != null && (
this.validated_address == null ||
this.validated_address.hostname != address.hostname ||
this.validated_address.port != address.port ||
this.validated_address.scheme != address.scheme) {
this.cancellable = new GLib.Cancellable();
this.resolver.lookup_by_name_async.begin(
value.strip(), this.cancellable,
(obj, res) => {
try {
this.resolver.lookup_by_name_async.end(res);
this.validated_address = address;
update_state(Validator.Validity.VALID);
} catch (GLib.IOError.CANCELLED err) {
this.validated_address = null;
} catch (GLib.Error err) {
this.validated_address = null;
update_state(Validator.Validity.INVALID);
}
this.cancellable = null;
this.validated_address.scheme != address.scheme)) {
this.cancellable = new GLib.Cancellable();
this.resolver.lookup_by_name_async.begin(
address.hostname, this.cancellable,
(obj, res) => {
try {
this.resolver.lookup_by_name_async.end(res);
this.validated_address = address;
update_state(Validator.Validity.VALID);
} catch (GLib.IOError.CANCELLED err) {
this.validated_address = null;
} catch (GLib.Error err) {
this.validated_address = null;
update_state(Validator.Validity.INVALID);
}
);
this.cancellable = null;
}
);
ret = Validator.Validity.IN_PROGRESS;
}
} else {
ret = Validator.Validity.INVALID;
ret = Validator.Validity.IN_PROGRESS;
}
return ret;