-
-
Notifications
You must be signed in to change notification settings - Fork 383
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
4 changed files
with
207 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // Copyright 2024 Woodpecker Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package docker | ||
|
|
||
| import ( | ||
| "path/filepath" | ||
| "regexp" | ||
| "strings" | ||
|
|
||
| "go.woodpecker-ci.org/woodpecker/v2/pipeline/backend/types" | ||
| ) | ||
|
|
||
| const ( | ||
| osTypeWindows = "windows" | ||
| defaultWindowsDriverLetter = "C:" | ||
| ) | ||
|
|
||
| var MustNotAddWindowsLetterPattern = regexp.MustCompile(`^(?:` + | ||
| // Drive letter followed by colon and optional backslash (C: or C:\) | ||
| `[a-zA-Z]:(?:\\|$)|` + | ||
|
|
||
| // Device path starting with \\ or // followed by .\ or ./ (\\.\ or //./ or \\./ or //.\ ) | ||
| `(?:\\\\|//)\.(?:\\|/).*|` + | ||
|
|
||
| // UNC path starting with \\ or // followed by non-dot (\server or //server) | ||
| `(?:\\\\|//)[^.]|` + | ||
|
|
||
| // Relative path starting with .\ or ./ (.\path or ./path) | ||
| `\.(?:\\|/)` + | ||
| `)`) | ||
|
|
||
| func (e *docker) windowsPathPatch(step *types.Step) { | ||
| // only patch if target is windows | ||
| if strings.ToLower(e.info.OSType) != osTypeWindows { | ||
| return | ||
| } | ||
|
|
||
| // patch volumes to have an letter if not already set | ||
| for i, vol := range step.Volumes { | ||
| volParts, err := splitVolumeParts(vol) | ||
| if err != nil || len(volParts) < 2 { | ||
| // ignore non valid volumes for now | ||
| continue | ||
| } | ||
|
|
||
| // fix source destination | ||
| if strings.HasPrefix(volParts[0], "/") { | ||
| volParts[0] = filepath.Join(defaultWindowsDriverLetter, volParts[0]) | ||
| } | ||
|
|
||
| // fix mount destination | ||
| if !MustNotAddWindowsLetterPattern.MatchString(volParts[1]) { | ||
| volParts[1] = filepath.Join(defaultWindowsDriverLetter, volParts[1]) | ||
| } | ||
| step.Volumes[i] = strings.Join(volParts, ":") | ||
| } | ||
|
|
||
| // patch workspace | ||
| if !MustNotAddWindowsLetterPattern.MatchString(step.WorkingDir) { | ||
| step.WorkingDir = filepath.Join(defaultWindowsDriverLetter, step.WorkingDir) | ||
| } | ||
| if ciWorkspace, ok := step.Environment["CI_WORKSPACE"]; ok { | ||
| if !MustNotAddWindowsLetterPattern.MatchString(ciWorkspace) { | ||
| step.Environment["CI_WORKSPACE"] = filepath.Join(defaultWindowsDriverLetter, ciWorkspace) | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // Copyright 2024 Woodpecker Authors | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package docker | ||
|
|
||
| import "testing" | ||
|
|
||
| func TestMustNotAddWindowsLetterPattern(t *testing.T) { | ||
| tests := map[string]bool{ | ||
| `C:\Users`: true, | ||
| `D:\Data`: true, | ||
| `\\.\PhysicalDrive0`: true, | ||
| `//./COM1`: true, | ||
| `E:`: true, | ||
| `\\server\share`: true, // UNC path | ||
| `.\relative\path`: true, // Relative path | ||
| `./path`: true, // Relative with forward slash | ||
| `//server/share`: true, // UNC with forward slashes | ||
| `not/a/windows/path`: false, | ||
| ``: false, | ||
| `/usr/local`: false, | ||
| `COM1`: false, | ||
| `\\.`: false, // Incomplete device path | ||
| `//`: false, | ||
| } | ||
|
|
||
| for testCase, expected := range tests { | ||
| result := MustNotAddWindowsLetterPattern.MatchString(testCase) | ||
| if result != expected { | ||
| t.Errorf("Test case %q: expected %v but got %v", testCase, expected, result) | ||
| } | ||
| } | ||
| } |