Unverified Commit 895e028c authored by John Davis's avatar John Davis Committed by GitHub
Browse files

Merge pull request #14080 from natefoo/fix-validate-domain 

Fix overlapping method/var name in domain validation
parents 7887f5dc a9047f84

lib/galaxy/security/validate_user_input.py

+3 −3
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ def validate_email(trans, email, user=None, check_dup=True, allow_empty=False, v 
    message = validate_email_str(email)

    if not message and validate_domain:

        domain = extract_domain(email)

        message = validate_domain(domain)

        message = validate_domain_resolves(domain)



    if (

        not message
@@ -97,8 +97,8 @@ def validate_email(trans, email, user=None, check_dup=True, allow_empty=False, v 
    return message





def validate_domain(domain):

    message = None

def validate_domain_resolves(domain):

    message = ""

    try:

        socket.gethostbyname(domain)

    except socket.gaierror:

test/unit/data/security/test_validate_user_input.py

+3 −3
Original line number Diff line number Diff line 
from galaxy.security.validate_user_input import (

    extract_domain,

    validate_domain,

    validate_domain_resolves,

    validate_email_str,

    validate_publicname_str,

)
@@ -20,8 +20,8 @@ def test_extract_base_domain(): 




def test_validate_domain():

    assert validate_domain("example.org") is None

    assert validate_domain("this is an invalid domain!") is not None

    assert validate_domain_resolves("example.org") == ""

    assert validate_domain_resolves("this is an invalid domain!") != ""





def test_validate_username():