Skip to content

Commit

Permalink
Merge pull request #7 from imagekit-developer/IK-1458
Browse files Browse the repository at this point in the history 
fix signed url
  • Loading branch information
@imagekitio
imagekitio authored May 21, 2024
2 parents 557eb49 + 2a2da58 commit 1d7e6e6
Show file tree
Hide file tree
Showing 2 changed files with 84 additions and 51 deletions.
107 changes: 62 additions & 45 deletions imagekit_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ import (
neturl "net/url"
"os"
"reflect"
"regexp"
"sort"
"strings"
"testing"

"github.com/google/go-cmp/cmp"
Expand Down Expand Up @@ -63,7 +60,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://imagekit.io/343534/tr:w-100,rt-90/default-image.jpg",
url: "https://imagekit.io/343534/tr:rt-90,w-100/default-image.jpg",
}, {
name: "signed-url",
params: ikurl.UrlParam{
Expand All @@ -76,6 +73,57 @@ func TestUrl(t *testing.T) {
},
url: "https://ik.imagekit.io/test/default-image.jpg?ik-t=1653775928&ik-s=48842eca663c6895331331db6c90f262c601f4e8",
}, {
name: "signed-url-with-transformation",
params: ikurl.UrlParam{
Path: "default-image.jpg",
Signed: true,
ExpireSeconds: 100,
UnixTime: func() int64 {
return 1653775828
},
Transformations: []map[string]any{
{
"height": 300,
"width": 300,
},
},
},
url: "https://ik.imagekit.io/test/tr:h-300,w-300/default-image.jpg?ik-t=1653775928&ik-s=1a74eab9fca6fa0bb2298aa07f4e3892a925a508",
},
{
name: "signed-url-with-transformation-in-query",
params: ikurl.UrlParam{
Path: "default-image.jpg",
Signed: true,
ExpireSeconds: 100,
UnixTime: func() int64 {
return 1653775828
},
TransformationPosition: "query",
Transformations: []map[string]any{
{
"height": 300,
"width": 300,
},
},
},
url: "https://ik.imagekit.io/test/default-image.jpg?tr=h-300%2Cw-300&ik-t=1653775928&ik-s=55f319d3a7db76e652545599a57af3dd94e32e24",
},
{
name: "signed-url-without-ExpireSeconds",
params: ikurl.UrlParam{
Path: "default-image.jpg",
Signed: true,
Transformations: []map[string]any{
{
"height": 300,
"width": 300,
},
},
},
url: "https://ik.imagekit.io/test/tr:h-300,w-300/default-image.jpg?ik-s=355f6c8a91031847828169116fd1d1db6e2aa8c7",
},
{
name: "src-with-transformation",
params: ikurl.UrlParam{
Src: "https://imagekit.io/343534/default-image.jpg",
Expand All @@ -86,7 +134,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://imagekit.io/343534/default-image.jpg?tr=w-100,rt-90",
url: "https://imagekit.io/343534/default-image.jpg?tr=rt-90%2Cw-100",
}, {
name: "src-without-transformation",
params: ikurl.UrlParam{
Expand All @@ -106,7 +154,7 @@ func TestUrl(t *testing.T) {
},
TransformationPosition: ikurl.QUERY,
},
url: "https://imagekit.io/343534/default-image.jpg?tr=w-100%2crt-90",
url: "https://imagekit.io/343534/default-image.jpg?tr=rt-90%2Cw-100",
}, {
name: "transformations",
params: ikurl.UrlParam{
Expand Down Expand Up @@ -141,7 +189,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/dk1m7xkgi/tr:w-200,h-400,cm-extract,fo-center,x-100,y-110,q-85,f-auto,bl-5,dpr-auto,e-grayscale,di-test2_hBIIEweBy.gif,pr-true,lo-true,t-true,b-5_005500,cp-true,md-true,rt-auto,r-40,bg-344222,e-sharpen,e-contrast,x-1/default-image.jpg",
url: "https://ik.imagekit.io/dk1m7xkgi/tr:b-5_005500,bg-344222,bl-5,cm-extract,cp-true,di-test2_hBIIEweBy.gif,dpr-auto,e-contrast,e-grayscale,e-sharpen,f-auto,fo-center,h-400,lo-true,md-true,pr-true,q-85,r-40,rt-auto,t-true,w-200,x-1,x-100,y-110/default-image.jpg",
}, {
name: "aspect-ratio-xc-yc",
params: ikurl.UrlParam{
Expand All @@ -163,7 +211,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/test/tr:w-200,ar-16-9,cm-extract,fo-center,xc-100,yc-110,q-85,f-auto,bl-50,dpr-2,rt-90,e-sharpen-40/default-image.jpg",
url: "https://ik.imagekit.io/test/tr:ar-16-9,bl-50,cm-extract,dpr-2,e-sharpen-40,f-auto,fo-center,q-85,rt-90,w-200,xc-100,yc-110/default-image.jpg",
}, {
name: "unsharp-mask",
params: ikurl.UrlParam{
Expand All @@ -189,7 +237,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/343534/tr:w-100,h-200:rt-90/default-image.jpg",
url: "https://ik.imagekit.io/343534/tr:h-200,w-100:rt-90/default-image.jpg",
}, {

name: "common-overlay-options",
Expand All @@ -206,7 +254,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/test/tr:ox-100,oy-110,oh-100,ow-90,obg-443322,ofo-bottom/default-image.jpg",
url: "https://ik.imagekit.io/test/tr:obg-443322,ofo-bottom,oh-100,ow-90,ox-100,oy-110/default-image.jpg",
}, {
name: "text-overlay-options",
params: ikurl.UrlParam{
Expand All @@ -229,7 +277,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/test/tr:ot-this%20is%20a%20sample%20overlay,ox-100,oy-110,oh-500,ow-900,otbg-ffffff,otp-20_40,otia-right,otc-blue,otf-Arvo,ots-40,ott-ib,or-20/default-image.jpg",
url: "https://ik.imagekit.io/test/tr:oh-500,or-20,ot-this%20is%20a%20sample%20overlay,otbg-ffffff,otc-blue,otf-Arvo,otia-right,otp-20_40,ots-40,ott-ib,ow-900,ox-100,oy-110/default-image.jpg",
}, {
name: "image-overlay-options",
params: ikurl.UrlParam{
Expand All @@ -251,7 +299,7 @@ func TestUrl(t *testing.T) {
},
},
},
url: "https://ik.imagekit.io/test/tr:oi-test2_hBIIEweBy.gif,ox-100,oy-110,oh-200,ow-200,oib-4_blue,oidpr-0.2,oiq-80,oic-at_max,oix-100,oiy-20,oit-false/default-image.jpg",
url: "https://ik.imagekit.io/test/tr:oh-200,oi-test2_hBIIEweBy.gif,oib-4_blue,oic-at_max,oidpr-0.2,oiq-80,oit-false,oix-100,oiy-20,ow-200,ox-100,oy-110/default-image.jpg",
},
}

Expand All @@ -262,45 +310,14 @@ func TestUrl(t *testing.T) {
if err != nil {
t.Errorf(err.Error())
}

if strings.Index(tc.url, "tr:") > -1 {
url, tr := extractTransformation(t, url)
expectedUrl, expectedTr := extractTransformation(t, tc.url)

if !urlsEquals(url, expectedUrl) {
t.Errorf("expected url: %s\ngot: %s", expectedUrl, url)
}

if !cmp.Equal(tr, expectedTr) {
t.Errorf("url: %s, expected tr: %s\ngot tr: %s", tc.url, expectedTr, tr)
}
if !urlsEquals(url, tc.url) {
t.Errorf("expected url: %s\ngot: %s", tc.url, url)
}
})
}

}

func extractTransformation(t *testing.T, url string) (urlResult string, trResult []string) {
re := regexp.MustCompile("tr:(.+)/")
m := re.FindStringSubmatch(url)

if m == nil {
t.Error("transformation not found")
return
}

urlResult = strings.Replace(url, "tr:"+m[1], "", 1)
trs := strings.Split(m[1], ":")

for _, tr := range trs {
parts := strings.Split(tr, ",")
sort.Strings(parts)
trResult = append(trResult, parts...)
}

return urlResult, trResult
}

func urlsEquals(url1 string, url2 string) bool {
u1, _ := neturl.Parse(url1)
u2, _ := neturl.Parse(url2)
Expand Down
28 changes: 22 additions & 6 deletions url.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@ import (
"encoding/hex"
"fmt"
neturl "net/url"
"sort"
"strconv"
"strings"
"time"

ikurl "github.com/imagekit-developer/imagekit-go/url"
)

const DEFAULT_TIMESTAMP = 9999999999

// Url generates url from UrlParam
func (ik *ImageKit) Url(params ikurl.UrlParam) (string, error) {
var resultUrl string
Expand Down Expand Up @@ -42,7 +45,7 @@ func (ik *ImageKit) Url(params ikurl.UrlParam) (string, error) {
} else {
if params.TransformationPosition == ikurl.QUERY {
params.QueryParameters["tr"] = joinTransformations(params.Transformations...)
url, err = neturl.Parse(endpoint + params.Path)
url, err = neturl.Parse(strings.TrimRight(endpoint, "/") + "/" + strings.TrimLeft(params.Path, "/"))

} else {
url, err = neturl.Parse(url.String() +
Expand Down Expand Up @@ -81,18 +84,30 @@ func (ik *ImageKit) Url(params ikurl.UrlParam) (string, error) {
now = params.UnixTime()
}

var expires = strconv.FormatInt(now+int64(params.ExpireSeconds), 10)
var expires string
if params.ExpireSeconds > 0 {
expires = strconv.FormatInt(now+int64(params.ExpireSeconds), 10)
} else {
expires = strconv.Itoa(DEFAULT_TIMESTAMP)
}
var path = strings.Replace(resultUrl, endpoint, "", 1)

path = strings.TrimPrefix(path, "/")
path = path + expires
mac := hmac.New(sha1.New, []byte(ik.Config.Cloud.PrivateKey))
mac.Write([]byte(path))
signature := hex.EncodeToString(mac.Sum(nil))

if strings.Index(resultUrl, "?") > -1 {
resultUrl = resultUrl + "&" + fmt.Sprintf("ik-t=%s&ik-s=%s", expires, signature)
if params.ExpireSeconds > 0 && params.ExpireSeconds != DEFAULT_TIMESTAMP {
resultUrl = resultUrl + "&" + fmt.Sprintf("ik-t=%s&ik-s=%s", expires, signature)
} else {
resultUrl = resultUrl + "&" + fmt.Sprintf("ik-s=%s", signature)
}
} else {
resultUrl = resultUrl + "?" + fmt.Sprintf("ik-t=%s&ik-s=%s", expires, signature)
if params.ExpireSeconds > 0 && params.ExpireSeconds != DEFAULT_TIMESTAMP {
resultUrl = resultUrl + "?" + fmt.Sprintf("ik-t=%s&ik-s=%s", expires, signature)
} else {
resultUrl = resultUrl + "?" + fmt.Sprintf("ik-s=%s", signature)
}
}
}

Expand Down Expand Up @@ -134,6 +149,7 @@ func transform(tr map[string]any) string {
parts = append(parts, prefix+"-"+value)
}
}
sort.Strings(parts)

return strings.Join(parts, ",")
}

0 comments on commit 1d7e6e6

Please sign in to comment.