Bring in goodies from testing.

# Conflicts:
#	docs/testing/wine-proton.md
This commit is contained in:
hjozwiak committed 2026-11-02 11:30:32 -05:00
commit 3026bc55c2
54 files changed
+2615 -918

No files matched your search

-80
View File
@@ -5,8 +5,6 @@ package wine
import (
"bytes"
"crypto/sha256"
"fmt"
"os"
"path/filepath"
"sort"
@@ -104,81 +102,3 @@ func helper_arguments(controllerOnly bool, settings Settings) []string {
}
return arguments
}
// A pressure-vessel wineserver cannot see the host's /usr. Publish complete,
// immutable helper sets in the home-mounted state directory. Never overwrite
// an older set: running processes may still have its sidecar mapped.
func stage_helper(helper string, environment map[string]string) (string, error) {
if _, present := environment["PRESSURE_VESSEL_RUNTIME"]; !present {
return helper, nil
}
stateHome := os.Getenv("XDG_STATE_HOME")
if stateHome == "" {
home, err := os.UserHomeDir()
if err != nil {
return "", err
}
stateHome = filepath.Join(home, ".local", "state")
}
if !filepath.IsAbs(stateHome) {
return "", fmt.Errorf("Wine helper state directory must be absolute")
}
names := []string{filepath.Base(helper), filepath.Base(helper) + ".so", "wine-access-menu.dll", "wine-access-menu32.dll", "wine-access-menu-host32.exe"}
contents := make(map[string][]byte)
modes := make(map[string]os.FileMode)
digest := sha256.New()
for _, name := range names {
path := filepath.Join(filepath.Dir(helper), name)
data, err := os.ReadFile(path)
if err != nil {
return "", fmt.Errorf("read helper set: %w", err)
}
info, err := os.Stat(path)
if err != nil {
return "", err
}
contents[name], modes[name] = data, 0600
if info.Mode().Perm()&0111 != 0 {
modes[name] = 0700
}
fmt.Fprintf(digest, "%s\x00%d\x00%d\x00", name, len(data), modes[name])
digest.Write(data)
}
root := filepath.Join(stateHome, "cthulhu", "wine-access", "helper")
if err := os.MkdirAll(root, 0700); err != nil {
return "", err
}
stage := filepath.Join(root, fmt.Sprintf("%x", digest.Sum(nil)))
if _, err := os.Stat(stage); os.IsNotExist(err) {
temporary, err := os.MkdirTemp(root, ".stage-")
if err != nil {
return "", err
}
defer os.RemoveAll(temporary)
for _, name := range names {
if err := os.WriteFile(filepath.Join(temporary, name), contents[name], modes[name]); err != nil {
return "", err
}
}
if err := os.Rename(temporary, stage); err != nil {
if info, statErr := os.Stat(stage); statErr != nil || !info.IsDir() {
return "", err
}
}
}
for _, name := range names {
path := filepath.Join(stage, name)
data, err := os.ReadFile(path)
if err != nil {
return "", err
}
info, err := os.Stat(path)
if err != nil {
return "", err
}
if !bytes.Equal(data, contents[name]) || info.Mode().Perm() != modes[name] {
return "", fmt.Errorf("incomplete or modified staged Wine helper")
}
}
return filepath.Join(stage, filepath.Base(helper)), nil
}