Skip to content

GRAILS-11333: Handle already absolute URLs #490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

GRAILS-11333: Handle already absolute URLs #490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions ...ls-web/src/main/groovy/org/codehaus/groovy/grails/web/mapping/DefaultLinkGenerator.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,17 +65,19 @@ class DefaultLinkGenerator implements LinkGenerator, PluginManagerAware{
def writer = new StringBuilder()
// prefer URI attribute
if (attrs.get(ATTRIBUTE_URI) != null) {
final base = handleAbsolute(attrs)
if (base != null) {
writer << base
}
else {
final cp = attrs.get(ATTRIBUTE_CONTEXT_PATH)
if (cp == null) cp = getContextPath()
if (cp != null)
writer << cp
}
final uriPath = attrs.get(ATTRIBUTE_URI).toString()
if(!isUriAbsolute(uriPath)){
final base = handleAbsolute(attrs)
if (base != null) {
writer << base
}
else {
final cp = attrs.get(ATTRIBUTE_CONTEXT_PATH)
if (cp == null) cp = getContextPath()
if (cp != null)
writer << cp
}
}
writer << uriPath
}
else {
Expand Down Expand Up @@ -244,6 +246,15 @@ class DefaultLinkGenerator implements LinkGenerator, PluginManagerAware{
}
}

private boolean isUriAbsolute(String uri){
try{
return new URI(uri).absolute
}catch(Exception e){
// assume unparseable URIs are absolute
return true
}
}

/**
* Get the declared URL of the server from config, or guess at localhost for non-production.
*/
Expand Down
15 changes: 15 additions & 0 deletions grails-web/src/test/groovy/org/codehaus/groovy/grails/web/mapping/LinkGeneratorSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,27 @@ class LinkGeneratorSpec extends Specification {

def baseUrl = "http://myserver.com/foo"
def context = "/bar"
def someAbsoluteUrl = "http://www.grails.org/"
def resource = null
def linkParams = [:]
def pluginManager

def mainCssResource = [dir:'css', file:'main.css']

def "Test absolute link"() {
when:
linkParams.uri = someAbsoluteUrl
linkParams.absolute = true
then:
link == someAbsoluteUrl

when:
linkParams.uri = someAbsoluteUrl

then:
link == someAbsoluteUrl
}

def "Test create link with root URI"() {
when:
linkParams.uri = '/'
Expand Down