Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
d9d50c43
Commit
d9d50c43
authored
Aug 27, 2024
by
Michael Yang
Browse files
validate model path
parent
6c1c1ad6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
13 deletions
+13
-13
server/modelpath.go
server/modelpath.go
+5
-13
server/modelpath_test.go
server/modelpath_test.go
+8
-0
No files found.
server/modelpath.go
View file @
d9d50c43
...
...
@@ -73,18 +73,6 @@ func ParseModelPath(name string) ModelPath {
var
errModelPathInvalid
=
errors
.
New
(
"invalid model path"
)
func
(
mp
ModelPath
)
Validate
()
error
{
if
mp
.
Repository
==
""
{
return
fmt
.
Errorf
(
"%w: model repository name is required"
,
errModelPathInvalid
)
}
if
strings
.
Contains
(
mp
.
Tag
,
":"
)
{
return
fmt
.
Errorf
(
"%w: ':' (colon) is not allowed in tag names"
,
errModelPathInvalid
)
}
return
nil
}
func
(
mp
ModelPath
)
GetNamespaceRepository
()
string
{
return
fmt
.
Sprintf
(
"%s/%s"
,
mp
.
Namespace
,
mp
.
Repository
)
}
...
...
@@ -105,7 +93,11 @@ func (mp ModelPath) GetShortTagname() string {
// GetManifestPath returns the path to the manifest file for the given model path, it is up to the caller to create the directory if it does not exist.
func
(
mp
ModelPath
)
GetManifestPath
()
(
string
,
error
)
{
return
filepath
.
Join
(
envconfig
.
Models
(),
"manifests"
,
mp
.
Registry
,
mp
.
Namespace
,
mp
.
Repository
,
mp
.
Tag
),
nil
if
p
:=
filepath
.
Join
(
mp
.
Registry
,
mp
.
Namespace
,
mp
.
Repository
,
mp
.
Tag
);
filepath
.
IsLocal
(
p
)
{
return
filepath
.
Join
(
envconfig
.
Models
(),
"manifests"
,
p
),
nil
}
return
""
,
errModelPathInvalid
}
func
(
mp
ModelPath
)
BaseURL
()
*
url
.
URL
{
...
...
server/modelpath_test.go
View file @
d9d50c43
package
server
import
(
"errors"
"os"
"path/filepath"
"testing"
...
...
@@ -154,3 +155,10 @@ func TestParseModelPath(t *testing.T) {
})
}
}
func
TestInsecureModelpath
(
t
*
testing
.
T
)
{
mp
:=
ParseModelPath
(
"../../..:something"
)
if
_
,
err
:=
mp
.
GetManifestPath
();
!
errors
.
Is
(
err
,
errModelPathInvalid
)
{
t
.
Errorf
(
"expected error: %v"
,
err
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment