Skip to content

Fix broken master because of security merge

What does this MR do?

Fix broken master because of the merge of https://gitlab.com/gitlab-org/gitlab-ce/commit/f5c1cd489834e824c83f2ae909cd0dd41fb95dab

What happened?

in the security MR we had the method:

def enforce_uri_hostname(addrs_info, uri, hostname, dns_rebind_protection)

In this method, the first parameter we expected is an AddrsInfo object. Nevertheless, in https://gitlab.com/gitlab-org/gitlab-ce/commit/e5bdcfbc9b1007332fdaa1d37ce1fac47325850d the method mas modified in a refactor in the following way:

def enforce_uri_hostname(ip_address, uri, hostname, dns_rebind_protection)

Now, the expected param was a String.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65294

Does this MR meet the acceptance criteria?

Conformity

Edited by Mayra Cabrera

Merge request reports