docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
cmd = commandWithSudo("security", "trust-settings-import", "-d", plistFile.Name()) | <mask> fatalIfErr(err, "failed to serialize trust settings")
<mask> err = ioutil.WriteFile(plistFile.Name(), plistData, 0600)
<mask> fatalIfErr(err, "failed to write trust settings")
<mask>
<mask> cmd = exec.Command("sudo", "security", "trust-settings-import", "-d", plistFile.Name())
<mask> out, err = cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "security trust-settings-import", out)
<mask>
<mask> return true
<mask> }
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = exec.Command("sudo", "security", "trust-settings-export", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-export", "-d", plistFile.Name()) </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_darwin.go |
cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) | <mask> return true
<mask> }
<mask>
<mask> func (m *mkcert) uninstallPlatform() bool {
<mask> cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "security remove-trusted-cert", out)
<mask>
<mask> return true
<mask> }
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd := exec.Command("sudo", "security", "add-trusted-cert", "-d", "-k", "/Library/Keychains/System.keychain", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "add-trusted-cert", "-d", "-k", "/Library/Keychains/System.keychain", filepath.Join(m.CAROOT, rootName)) </s> remove cmd = exec.Command("sudo", "security", "trust-settings-import", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-import", "-d", plistFile.Name()) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove
func CommandWithSudo(cmd ...string) *exec.Cmd {
if !binaryExists("sudo") {
return exec.Command(cmd[0], cmd[1:]...)
}
return exec.Command("sudo", append([]string{"--"}, cmd...)...)
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_darwin.go |
// the command with commandWithSudo to work around file permissions. | <mask> fatalIfCmdErr(err, "keytool -delete", out)
<mask> }
<mask>
<mask> // execKeytool will execute a "keytool" command and if needed re-execute
<mask> // the command wrapped in 'sudo' to work around file permissions.
<mask> func (m *mkcert) execKeytool(cmd *exec.Cmd) ([]byte, error) {
<mask> out, err := cmd.CombinedOutput()
<mask> if err != nil && bytes.Contains(out, []byte("java.io.FileNotFoundException")) && runtime.GOOS != "windows" {
<mask> origArgs := cmd.Args[1:]
<mask> cmd = exec.Command("sudo", keytoolPath)
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = exec.Command("sudo", keytoolPath)
</s> add cmd = commandWithSudo(keytoolPath) </s> remove cmd := exec.Command("sudo", "security", "add-trusted-cert", "-d", "-k", "/Library/Keychains/System.keychain", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "add-trusted-cert", "-d", "-k", "/Library/Keychains/System.keychain", filepath.Join(m.CAROOT, rootName)) </s> remove cmd := CommandWithSudo("rm", "-f", m.systemTrustFilename())
</s> add cmd := commandWithSudo("rm", "-f", m.systemTrustFilename()) </s> remove cmd := CommandWithSudo("rm", "-f", legacyFilename)
</s> add cmd := commandWithSudo("rm", "-f", legacyFilename) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_java.go |
cmd = commandWithSudo(keytoolPath) | <mask> func (m *mkcert) execKeytool(cmd *exec.Cmd) ([]byte, error) {
<mask> out, err := cmd.CombinedOutput()
<mask> if err != nil && bytes.Contains(out, []byte("java.io.FileNotFoundException")) && runtime.GOOS != "windows" {
<mask> origArgs := cmd.Args[1:]
<mask> cmd = exec.Command("sudo", keytoolPath)
<mask> cmd.Args = append(cmd.Args, origArgs...)
<mask> cmd.Env = []string{
<mask> "JAVA_HOME=" + javaHome,
<mask> }
<mask> out, err = cmd.CombinedOutput()
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove // the command wrapped in 'sudo' to work around file permissions.
</s> add // the command with commandWithSudo to work around file permissions. </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_java.go |
<mask> "fmt"
<mask> "io/ioutil"
<mask> "log"
<mask> "os"
<mask> "os/exec"
<mask> "path/filepath"
<mask> "strings"
<mask> )
<mask>
<mask> var (
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove "os/exec"
</s> add </s> remove
func CommandWithSudo(cmd ...string) *exec.Cmd {
if !binaryExists("sudo") {
return exec.Command(cmd[0], cmd[1:]...)
}
return exec.Command("sudo", append([]string{"--"}, cmd...)...)
}
</s> add </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go | |
cmd := commandWithSudo("tee", m.systemTrustFilename()) | <mask>
<mask> cert, err := ioutil.ReadFile(filepath.Join(m.CAROOT, rootName))
<mask> fatalIfErr(err, "failed to read root certificate")
<mask>
<mask> cmd := CommandWithSudo("tee", m.systemTrustFilename())
<mask> cmd.Stdin = bytes.NewReader(cert)
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "tee", out)
<mask>
<mask> cmd = CommandWithSudo(SystemTrustCommand...)
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd = exec.Command("sudo", "security", "trust-settings-export", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-export", "-d", plistFile.Name()) </s> remove cmd = exec.Command("sudo", "security", "trust-settings-import", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-import", "-d", plistFile.Name()) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := CommandWithSudo("rm", "-f", m.systemTrustFilename())
</s> add cmd := commandWithSudo("rm", "-f", m.systemTrustFilename()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go |
cmd = commandWithSudo(SystemTrustCommand...) | <mask> cmd.Stdin = bytes.NewReader(cert)
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "tee", out)
<mask>
<mask> cmd = CommandWithSudo(SystemTrustCommand...)
<mask> out, err = cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, strings.Join(SystemTrustCommand, " "), out)
<mask>
<mask> return true
<mask> }
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) </s> remove
func CommandWithSudo(cmd ...string) *exec.Cmd {
if !binaryExists("sudo") {
return exec.Command(cmd[0], cmd[1:]...)
}
return exec.Command("sudo", append([]string{"--"}, cmd...)...)
}
</s> add </s> remove cmd = exec.Command("sudo", "security", "trust-settings-import", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-import", "-d", plistFile.Name()) </s> remove cmd := CommandWithSudo("rm", "-f", legacyFilename)
</s> add cmd := commandWithSudo("rm", "-f", legacyFilename) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go |
cmd := commandWithSudo("rm", "-f", m.systemTrustFilename()) | <mask> if SystemTrustCommand == nil {
<mask> return false
<mask> }
<mask>
<mask> cmd := CommandWithSudo("rm", "-f", m.systemTrustFilename())
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "rm", out)
<mask>
<mask> // We used to install under non-unique filenames.
<mask> legacyFilename := fmt.Sprintf(SystemTrustFilename, "mkcert-rootCA")
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd := CommandWithSudo("rm", "-f", legacyFilename)
</s> add cmd := commandWithSudo("rm", "-f", legacyFilename) </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) </s> remove // the command wrapped in 'sudo' to work around file permissions.
</s> add // the command with commandWithSudo to work around file permissions. </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go |
cmd := commandWithSudo("rm", "-f", legacyFilename) | <mask>
<mask> // We used to install under non-unique filenames.
<mask> legacyFilename := fmt.Sprintf(SystemTrustFilename, "mkcert-rootCA")
<mask> if pathExists(legacyFilename) {
<mask> cmd := CommandWithSudo("rm", "-f", legacyFilename)
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "rm (legacy filename)", out)
<mask> }
<mask>
<mask> cmd = CommandWithSudo(SystemTrustCommand...)
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd := CommandWithSudo("rm", "-f", m.systemTrustFilename())
</s> add cmd := commandWithSudo("rm", "-f", m.systemTrustFilename()) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove // the command wrapped in 'sudo' to work around file permissions.
</s> add // the command with commandWithSudo to work around file permissions. | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go |
cmd = commandWithSudo(SystemTrustCommand...) | <mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "rm (legacy filename)", out)
<mask> }
<mask>
<mask> cmd = CommandWithSudo(SystemTrustCommand...)
<mask> out, err = cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, strings.Join(SystemTrustCommand, " "), out)
<mask>
<mask> return true
<mask> }
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := CommandWithSudo("rm", "-f", legacyFilename)
</s> add cmd := commandWithSudo("rm", "-f", legacyFilename) </s> remove
func CommandWithSudo(cmd ...string) *exec.Cmd {
if !binaryExists("sudo") {
return exec.Command(cmd[0], cmd[1:]...)
}
return exec.Command("sudo", append([]string{"--"}, cmd...)...)
}
</s> add </s> remove cmd := CommandWithSudo("tee", m.systemTrustFilename())
</s> add cmd := commandWithSudo("tee", m.systemTrustFilename()) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go |
<mask> fatalIfCmdErr(err, strings.Join(SystemTrustCommand, " "), out)
<mask>
<mask> return true
<mask> }
<mask>
<mask> func CommandWithSudo(cmd ...string) *exec.Cmd {
<mask> if !binaryExists("sudo") {
<mask> return exec.Command(cmd[0], cmd[1:]...)
<mask> }
<mask> return exec.Command("sudo", append([]string{"--"}, cmd...)...)
<mask> }
</s> Specify a "Sudo password:" prompt for sudo
Fixes #178
Closes #185 </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd = CommandWithSudo(SystemTrustCommand...)
</s> add cmd = commandWithSudo(SystemTrustCommand...) </s> remove cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
</s> add cmd := commandWithSudo("security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName)) </s> remove cmd := CommandWithSudo("rm", "-f", m.systemTrustFilename())
</s> add cmd := commandWithSudo("rm", "-f", m.systemTrustFilename()) </s> remove cmd = exec.Command("sudo", "security", "trust-settings-import", "-d", plistFile.Name())
</s> add cmd = commandWithSudo("security", "trust-settings-import", "-d", plistFile.Name()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/FiloSottile/mkcert/commit/aa4dd610664a3b092f35cb7c996d94e3c3da6159 | truststore_linux.go | |
"os/exec"
"os/user" | <mask> "math/big"
<mask> "net"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask> )
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) | <mask> "strings"
<mask> "time"
<mask> )
<mask>
<mask> var rootSubject = pkix.Name{
<mask> Organization: []string{"mkcert development CA"},
<mask> }
<mask>
<mask> func (m *mkcert) makeCert(hosts []string) {
<mask> if m.caKey == nil {
<mask> log.Fatalln("ERROR: can't create new certificates because the CA key (rootCA-key.pem) is missing")
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove Organization: []string{"mkcert development certificate"},
</s> add Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, | <mask>
<mask> tpl := &x509.Certificate{
<mask> SerialNumber: serialNumber,
<mask> Subject: pkix.Name{
<mask> Organization: []string{"mkcert development certificate"},
<mask> },
<mask>
<mask> NotAfter: time.Now().AddDate(10, 0, 0),
<mask> NotBefore: time.Now().AddDate(0, 0, -1),
<mask>
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
NotBefore: time.Now(), | <mask> Organization: []string{"mkcert development certificate"},
<mask> },
<mask>
<mask> NotAfter: time.Now().AddDate(10, 0, 0),
<mask> NotBefore: time.Now().AddDate(0, 0, -1),
<mask>
<mask> KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
<mask> ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
<mask> BasicConstraintsValid: true,
<mask> }
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove Organization: []string{"mkcert development certificate"},
</s> add Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, | <mask> fatalIfErr(err, "failed to generate serial number")
<mask>
<mask> tpl := &x509.Certificate{
<mask> SerialNumber: serialNumber,
<mask> Subject: rootSubject,
<mask>
<mask> NotAfter: time.Now().AddDate(10, 0, 0),
<mask> NotBefore: time.Now().AddDate(0, 0, -1),
<mask>
<mask> KeyUsage: x509.KeyUsageCertSign,
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove Organization: []string{"mkcert development certificate"},
</s> add Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
NotBefore: time.Now(), | <mask> SerialNumber: serialNumber,
<mask> Subject: rootSubject,
<mask>
<mask> NotAfter: time.Now().AddDate(10, 0, 0),
<mask> NotBefore: time.Now().AddDate(0, 0, -1),
<mask>
<mask> KeyUsage: x509.KeyUsageCertSign,
<mask>
<mask> BasicConstraintsValid: true,
<mask> IsCA: true,
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove Organization: []string{"mkcert development certificate"},
</s> add Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, </s> remove rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
</s> add rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | cert.go |
rootSubjectASN1, _ := asn1.Marshal(m.caCert.Subject.ToRDNSequence()) | <mask> var plistRoot map[string]interface{}
<mask> _, err = plist.Unmarshal(plistData, &plistRoot)
<mask> fatalIfErr(err, "failed to parse trust settings")
<mask>
<mask> rootSubjectASN1, _ := asn1.Marshal(rootSubject.ToRDNSequence())
<mask>
<mask> if plistRoot["trustVersion"].(uint64) != 1 {
<mask> log.Fatalln("ERROR: unsupported trust settings version:", plistRoot["trustVersion"])
<mask> }
<mask> trustList := plistRoot["trustList"].(map[string]interface{})
</s> Add user@hostname to the OU, and set NotBefore to now
This will help figuring out where and when a certificate was created.
Fixes #31 </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
</s> add var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
userAndHostname = u.Username + "@"
}
out, _ := exec.Command("hostname").Output()
userAndHostname += strings.TrimSpace(string(out)) </s> remove Subject: rootSubject,
</s> add Subject: pkix.Name{
Organization: []string{"mkcert development CA"},
OrganizationalUnit: []string{userAndHostname},
}, </s> remove Organization: []string{"mkcert development certificate"},
</s> add Organization: []string{"mkcert development certificate"},
OrganizationalUnit: []string{userAndHostname}, </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), </s> remove NotBefore: time.Now().AddDate(0, 0, -1),
</s> add NotBefore: time.Now(), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/bf4af2d977b30daa753cea057d56514e8e93636b | truststore_darwin.go |
"net/url" | <mask> "net"
<mask> "net/mail"
<mask> "os"
<mask> "os/user"
<mask> "path/filepath"
<mask> "regexp"
<mask> "strconv"
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | cert.go |
} else if uriName, err := url.Parse(h); err == nil && uriName.Scheme != "" && uriName.Host != "" {
tpl.URIs = append(tpl.URIs, uriName) | <mask> } else if email, err := mail.ParseAddress(h); err == nil && email.Address == h {
<mask> tpl.EmailAddresses = append(tpl.EmailAddresses, h)
<mask> } else {
<mask> tpl.DNSNames = append(tpl.DNSNames, h)
<mask> }
<mask> }
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | cert.go |
"net/url" | <mask> "fmt"
<mask> "log"
<mask> "net"
<mask> "net/mail"
<mask> "os"
<mask> "os/exec"
<mask> "path/filepath"
<mask> "regexp"
<mask> "runtime"
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | main.go |
if uriName, err := url.Parse(name); err == nil && uriName.Scheme != "" && uriName.Host != "" {
continue
} | <mask> }
<mask> if email, err := mail.ParseAddress(name); err == nil && email.Address == name {
<mask> continue
<mask> }
<mask> punycode, err := idna.ToASCII(name)
<mask> if err != nil {
<mask> log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err)
<mask> }
<mask> args[i] = punycode
<mask> if !hostnameRegexp.MatchString(punycode) {
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | main.go |
log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) | <mask> continue
<mask> }
<mask> punycode, err := idna.ToASCII(name)
<mask> if err != nil {
<mask> log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
<mask> }
<mask> args[i] = punycode
<mask> if !hostnameRegexp.MatchString(punycode) {
<mask> log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
<mask> }
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | main.go |
log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email", name) | <mask> log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
<mask> }
<mask> args[i] = punycode
<mask> if !hostnameRegexp.MatchString(punycode) {
<mask> log.Fatalf("ERROR: %q is not a valid hostname, IP, or email", name)
<mask> }
<mask> }
<mask>
<mask> m.makeCert(args)
<mask> }
</s> Add support for URL SANs (#166) </s> remove log.Fatalf("ERROR: %q is not a valid hostname, IP, or email: %s", name, err)
</s> add log.Fatalf("ERROR: %q is not a valid hostname, IP, URL or email: %s", name, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c2b30c48f1d7e4cb2ec547e6e5305eb8548d0af7 | main.go |
"regexp" | <mask> "os"
<mask> "path/filepath"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask> )
</s> Add a warning for second-level wildcards
Fixes #30 </s> remove log.Fatalf("ERROR: %q is not a valid hostname or IP", name)
</s> add </s> remove if hostnameRegexp.MatchString(punycode) {
continue
</s> add if !hostnameRegexp.MatchString(punycode) {
log.Fatalf("ERROR: %q is not a valid hostname or IP", name) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c4f873a371b716afc5c9fb4e58982b38d9392117 | cert.go |
if !hostnameRegexp.MatchString(punycode) {
log.Fatalf("ERROR: %q is not a valid hostname or IP", name) | <mask> if err != nil {
<mask> log.Fatalf("ERROR: %q is not a valid hostname or IP: %s", name, err)
<mask> }
<mask> args[i] = punycode
<mask> if hostnameRegexp.MatchString(punycode) {
<mask> continue
<mask> }
<mask> log.Fatalf("ERROR: %q is not a valid hostname or IP", name)
<mask> }
<mask>
<mask> m.makeCert(args)
</s> Add a warning for second-level wildcards
Fixes #30 </s> remove log.Fatalf("ERROR: %q is not a valid hostname or IP", name)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c4f873a371b716afc5c9fb4e58982b38d9392117 | main.go |
<mask> args[i] = punycode
<mask> if hostnameRegexp.MatchString(punycode) {
<mask> continue
<mask> }
<mask> log.Fatalf("ERROR: %q is not a valid hostname or IP", name)
<mask> }
<mask>
<mask> m.makeCert(args)
<mask> }
<mask>
</s> Add a warning for second-level wildcards
Fixes #30 </s> remove if hostnameRegexp.MatchString(punycode) {
continue
</s> add if !hostnameRegexp.MatchString(punycode) {
log.Fatalf("ERROR: %q is not a valid hostname or IP", name) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/c4f873a371b716afc5c9fb4e58982b38d9392117 | main.go | |
<mask> package main
<mask>
<mask> import (
<mask> "crypto"
<mask> "crypto/rand"
<mask> "crypto/rsa"
<mask> "crypto/x509"
<mask> "crypto/x509/pkix"
<mask> "encoding/pem"
<mask> "flag"
<mask> "io/ioutil"
</s> Split off certificate generation code </s> remove "crypto/x509/pkix"
"encoding/pem"
</s> add </s> remove "math/big"
</s> add </s> remove "io/ioutil"
</s> add </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
}
</s> add </s> remove "strconv"
"strings"
"time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
<mask> "crypto"
<mask> "crypto/rand"
<mask> "crypto/rsa"
<mask> "crypto/x509"
<mask> "crypto/x509/pkix"
<mask> "encoding/pem"
<mask> "flag"
<mask> "io/ioutil"
<mask> "log"
<mask> "math/big"
<mask> "net"
</s> Split off certificate generation code </s> remove "crypto/rand"
"crypto/rsa"
</s> add </s> remove "math/big"
</s> add </s> remove "io/ioutil"
</s> add </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
}
</s> add </s> remove "strconv"
"strings"
"time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
<mask> "crypto/x509"
<mask> "crypto/x509/pkix"
<mask> "encoding/pem"
<mask> "flag"
<mask> "io/ioutil"
<mask> "log"
<mask> "math/big"
<mask> "net"
<mask> "os"
<mask> "path/filepath"
</s> Split off certificate generation code </s> remove "math/big"
</s> add </s> remove "crypto/x509/pkix"
"encoding/pem"
</s> add </s> remove "crypto/rand"
"crypto/rsa"
</s> add </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
}
</s> add </s> remove "strconv"
"strings"
"time"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
<mask> "encoding/pem"
<mask> "flag"
<mask> "io/ioutil"
<mask> "log"
<mask> "math/big"
<mask> "net"
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
<mask> "runtime"
</s> Split off certificate generation code </s> remove "strconv"
"strings"
"time"
</s> add </s> remove "io/ioutil"
</s> add </s> remove "crypto/x509/pkix"
"encoding/pem"
</s> add </s> remove "crypto/rand"
"crypto/rsa"
</s> add </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
}
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
<mask> "os"
<mask> "path/filepath"
<mask> "regexp"
<mask> "runtime"
<mask> "strconv"
<mask> "strings"
<mask> "time"
<mask> )
<mask>
<mask> func main() {
<mask> log.SetFlags(0)
<mask> var installFlag = flag.Bool("install", false, "install the local root CA in the system trust store")
</s> Split off certificate generation code </s> remove var rootSubject = pkix.Name{
Organization: []string{"mkcert development CA"},
}
</s> add </s> remove "math/big"
</s> add </s> remove "io/ioutil"
</s> add </s> remove "crypto/x509/pkix"
"encoding/pem"
</s> add </s> remove "crypto/rand"
"crypto/rsa"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
<mask>
<mask> const rootName = "rootCA.pem"
<mask> const keyName = "rootCA-key.pem"
<mask>
<mask> var rootSubject = pkix.Name{
<mask> Organization: []string{"mkcert development CA"},
<mask> }
<mask>
<mask> type mkcert struct {
<mask> installMode, uninstallMode bool
<mask>
<mask> CAROOT string
<mask> caCert *x509.Certificate
</s> Split off certificate generation code </s> remove "strconv"
"strings"
"time"
</s> add </s> remove "math/big"
</s> add </s> remove "io/ioutil"
</s> add </s> remove "crypto/x509/pkix"
"encoding/pem"
</s> add </s> remove "crypto/rand"
"crypto/rsa"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/d6aab07a4caaa3f4fd500c99841d0a256530a758 | main.go | |
case env = os.Getenv("XDG_DATA_HOME"); env != "":
dir = env | <mask> var dir string
<mask> switch runtime.GOOS {
<mask> case "windows":
<mask> dir = os.Getenv("LocalAppData")
<mask> case "darwin":
<mask> dir = os.Getenv("HOME")
<mask> if dir == "" {
<mask> return ""
<mask> }
</s> Use $XDG_DATA_HOME on macOS if it is set (#40) </s> remove dir = os.Getenv("HOME")
if dir == "" {
return ""
}
dir = filepath.Join(dir, ".local", "share")
</s> add return "" </s> remove dir = os.Getenv("XDG_DATA_HOME")
</s> add dir = os.Getenv("HOME") | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/dbad5f86ec85334e4e33c31aa8639864fce3fbdc | main.go |
dir = os.Getenv("HOME") | <mask> return ""
<mask> }
<mask> dir = filepath.Join(dir, "Library", "Application Support")
<mask> default: // Unix
<mask> dir = os.Getenv("XDG_DATA_HOME")
<mask> if dir == "" {
<mask> dir = os.Getenv("HOME")
<mask> if dir == "" {
<mask> return ""
<mask> }
</s> Use $XDG_DATA_HOME on macOS if it is set (#40) </s> remove dir = os.Getenv("HOME")
if dir == "" {
return ""
}
dir = filepath.Join(dir, ".local", "share")
</s> add return "" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/dbad5f86ec85334e4e33c31aa8639864fce3fbdc | main.go |
return "" | <mask> dir = filepath.Join(dir, "Library", "Application Support")
<mask> default: // Unix
<mask> dir = os.Getenv("XDG_DATA_HOME")
<mask> if dir == "" {
<mask> dir = os.Getenv("HOME")
<mask> if dir == "" {
<mask> return ""
<mask> }
<mask> dir = filepath.Join(dir, ".local", "share")
<mask> }
<mask> }
<mask> return filepath.Join(dir, "mkcert")
<mask> }
<mask>
</s> Use $XDG_DATA_HOME on macOS if it is set (#40) </s> remove dir = os.Getenv("XDG_DATA_HOME")
</s> add dir = os.Getenv("HOME") | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/dbad5f86ec85334e4e33c31aa8639864fce3fbdc | main.go |
dir = filepath.Join(dir, ".local", "share") | <mask> return ""
<mask> }
<mask> }
<mask> return filepath.Join(dir, "mkcert")
<mask> }
<mask>
<mask> func (m *mkcert) install() {
</s> Use $XDG_DATA_HOME on macOS if it is set (#40) </s> remove dir = os.Getenv("XDG_DATA_HOME")
</s> add dir = os.Getenv("HOME") </s> remove dir = os.Getenv("HOME")
if dir == "" {
return ""
}
dir = filepath.Join(dir, ".local", "share")
</s> add return "" | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/dbad5f86ec85334e4e33c31aa8639864fce3fbdc | main.go |
NotBefore: time.Now(), NotAfter: expiration, | <mask> Organization: []string{"mkcert development certificate"},
<mask> OrganizationalUnit: []string{userAndHostname},
<mask> },
<mask>
<mask> NotAfter: expiration,
<mask> NotBefore: time.Now(),
<mask>
<mask> KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
<mask> BasicConstraintsValid: true,
<mask> }
<mask>
</s> Simplify EKU logic
With -client, you get clientAuth. With a non-email SAN, you also get
serverAuth. With an email SAN, you also get emailProtection. </s> remove KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
BasicConstraintsValid: true,
</s> add KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, </s> remove tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}
} else if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 {
tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}
</s> add tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageClientAuth)
}
if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 || len(tpl.URIs) > 0 {
tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageServerAuth) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e28ee7df01060e3eba5de51adaf092591b9b6c2e | cert.go |
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, | <mask>
<mask> NotAfter: expiration,
<mask> NotBefore: time.Now(),
<mask>
<mask> KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
<mask> BasicConstraintsValid: true,
<mask> }
<mask>
<mask> for _, h := range hosts {
<mask> if ip := net.ParseIP(h); ip != nil {
<mask> tpl.IPAddresses = append(tpl.IPAddresses, ip)
</s> Simplify EKU logic
With -client, you get clientAuth. With a non-email SAN, you also get
serverAuth. With an email SAN, you also get emailProtection. </s> remove NotAfter: expiration,
NotBefore: time.Now(),
</s> add NotBefore: time.Now(), NotAfter: expiration, </s> remove tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}
} else if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 {
tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}
</s> add tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageClientAuth)
}
if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 || len(tpl.URIs) > 0 {
tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageServerAuth) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e28ee7df01060e3eba5de51adaf092591b9b6c2e | cert.go |
tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageClientAuth)
}
if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 || len(tpl.URIs) > 0 {
tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageServerAuth) | <mask> }
<mask> }
<mask>
<mask> if m.client {
<mask> tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth, x509.ExtKeyUsageServerAuth}
<mask> } else if len(tpl.IPAddresses) > 0 || len(tpl.DNSNames) > 0 {
<mask> tpl.ExtKeyUsage = []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}
<mask> }
<mask> if len(tpl.EmailAddresses) > 0 {
<mask> tpl.ExtKeyUsage = append(tpl.ExtKeyUsage, x509.ExtKeyUsageEmailProtection)
<mask> }
<mask>
</s> Simplify EKU logic
With -client, you get clientAuth. With a non-email SAN, you also get
serverAuth. With an email SAN, you also get emailProtection. </s> remove KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
BasicConstraintsValid: true,
</s> add KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, </s> remove NotAfter: expiration,
NotBefore: time.Now(),
</s> add NotBefore: time.Now(), NotAfter: expiration, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e28ee7df01060e3eba5de51adaf092591b9b6c2e | cert.go |
func fatalIfCmdErr(err error, cmd string, out []byte) {
if err != nil {
log.Fatalf("ERROR: failed to execute \"%s\": %s\n\n%s\n", cmd, err, out)
}
} | <mask> if err != nil {
<mask> log.Fatalf("ERROR: %s: %s", msg, err)
<mask> }
<mask> }
</s> Add Firefox support
Fixes #6 </s> remove
func fatalIfCmdErr(err error, cmd string, out []byte) {
if err != nil {
log.Fatalf("ERROR: failed to execute \"%s\": %s\n\n%s\n", cmd, err, out)
}
}
</s> add | [
"keep",
"keep",
"keep",
"add"
] | https://github.com/FiloSottile/mkcert/commit/e4c5c312a755d81eb2bd352767dafafa401edb4a | main.go |
var (
FirefoxPath = "/Applications/Firefox.app"
FirefoxProfile = os.Getenv("HOME") + "/Library/Application Support/Firefox/Profiles/*"
CertutilInstallHelp = "brew install nss"
)
| <mask> "github.com/DHowett/go-plist"
<mask> )
<mask>
<mask> // https://github.com/golang/go/issues/24652#issuecomment-399826583
<mask> var trustSettings []interface{}
<mask> var _, _ = plist.Unmarshal(trustSettingsData, &trustSettings)
<mask> var trustSettingsData = []byte(`
<mask> <array>
</s> Add Firefox support
Fixes #6 </s> remove
func fatalIfCmdErr(err error, cmd string, out []byte) {
if err != nil {
log.Fatalf("ERROR: failed to execute \"%s\": %s\n\n%s\n", cmd, err, out)
}
}
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e4c5c312a755d81eb2bd352767dafafa401edb4a | truststore_darwin.go |
<mask> cmd := exec.Command("sudo", "security", "remove-trusted-cert", "-d", filepath.Join(m.CAROOT, rootName))
<mask> out, err := cmd.CombinedOutput()
<mask> fatalIfCmdErr(err, "security remove-trusted-cert", out)
<mask> }
<mask>
<mask> func fatalIfCmdErr(err error, cmd string, out []byte) {
<mask> if err != nil {
<mask> log.Fatalf("ERROR: failed to execute \"%s\": %s\n\n%s\n", cmd, err, out)
<mask> }
<mask> }
</s> Add Firefox support
Fixes #6 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace"
] | https://github.com/FiloSottile/mkcert/commit/e4c5c312a755d81eb2bd352767dafafa401edb4a | truststore_darwin.go | |
"os" | <mask> import (
<mask> "log"
<mask> "path/filepath"
<mask> )
<mask>
<mask> var (
</s> Add Firefox support
Fixes #6 </s> remove
func fatalIfCmdErr(err error, cmd string, out []byte) {
if err != nil {
log.Fatalf("ERROR: failed to execute \"%s\": %s\n\n%s\n", cmd, err, out)
}
}
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e4c5c312a755d81eb2bd352767dafafa401edb4a | truststore_linux.go |
c, err := x509.ParseCertificate(cert)
fatalIfErr(err, "failed to parse generated certificate") | <mask> cert, err := x509.CreateCertificate(rand.Reader, tpl, m.caCert, csr.PublicKey, m.caKey)
<mask> fatalIfErr(err, "failed to generate certificate")
<mask>
<mask> var hosts []string
<mask> hosts = append(hosts, c.DNSNames...)
<mask> hosts = append(hosts, c.EmailAddresses...)
</s> Print the right hosts when a CSR doesn't have SANs
Close #344
Fixes #318 </s> remove for _, uri := range csr.URIs {
</s> add for _, uri := range c.URIs { </s> remove hosts = append(hosts, csr.DNSNames...)
hosts = append(hosts, csr.EmailAddresses...)
for _, ip := range csr.IPAddresses {
</s> add hosts = append(hosts, c.DNSNames...)
hosts = append(hosts, c.EmailAddresses...)
for _, ip := range c.IPAddresses { | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e4df8ab30233b38b25931fdd1ec038c9031dae2f | cert.go |
hosts = append(hosts, c.DNSNames...)
hosts = append(hosts, c.EmailAddresses...)
for _, ip := range c.IPAddresses { | <mask> cert, err := x509.CreateCertificate(rand.Reader, tpl, m.caCert, csr.PublicKey, m.caKey)
<mask> fatalIfErr(err, "failed to generate certificate")
<mask>
<mask> var hosts []string
<mask> hosts = append(hosts, csr.DNSNames...)
<mask> hosts = append(hosts, csr.EmailAddresses...)
<mask> for _, ip := range csr.IPAddresses {
<mask> hosts = append(hosts, ip.String())
<mask> }
<mask> for _, uri := range csr.URIs {
<mask> hosts = append(hosts, uri.String())
<mask> }
</s> Print the right hosts when a CSR doesn't have SANs
Close #344
Fixes #318 </s> remove for _, uri := range csr.URIs {
</s> add for _, uri := range c.URIs { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e4df8ab30233b38b25931fdd1ec038c9031dae2f | cert.go |
for _, uri := range c.URIs { | <mask> hosts = append(hosts, csr.EmailAddresses...)
<mask> for _, ip := range csr.IPAddresses {
<mask> hosts = append(hosts, ip.String())
<mask> }
<mask> for _, uri := range csr.URIs {
<mask> hosts = append(hosts, uri.String())
<mask> }
<mask> certFile, _, _ := m.fileNames(hosts)
<mask>
<mask> err = ioutil.WriteFile(certFile, pem.EncodeToMemory(
</s> Print the right hosts when a CSR doesn't have SANs
Close #344
Fixes #318 </s> remove hosts = append(hosts, csr.DNSNames...)
hosts = append(hosts, csr.EmailAddresses...)
for _, ip := range csr.IPAddresses {
</s> add hosts = append(hosts, c.DNSNames...)
hosts = append(hosts, c.EmailAddresses...)
for _, ip := range c.IPAddresses { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e4df8ab30233b38b25931fdd1ec038c9031dae2f | cert.go |
"C:\\Program Files\\Mozilla Firefox", | <mask> for _, path := range []string{
<mask> "/usr/bin/firefox", nssDB, "/Applications/Firefox.app",
<mask> "/Applications/Firefox Developer Edition.app",
<mask> } {
<mask> _, err := os.Stat(path)
<mask> hasNSS = hasNSS || err == nil
<mask> }
<mask>
<mask> switch runtime.GOOS {
</s> Offer a less confusing warning about Firefox on Windows </s> remove CertutilInstallHelp = "<certutil unsupported on Windows>"
</s> add CertutilInstallHelp = "" // certutil unsupported on Windows </s> remove FirefoxPath = "C:\\Program Files\\Mozilla Firefox"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e5f9c16f8c95dfc6327b5e988d03a6dcbfbe0e9f | truststore_nss.go |
<mask> "unsafe"
<mask> )
<mask>
<mask> var (
<mask> FirefoxPath = "C:\\Program Files\\Mozilla Firefox"
<mask> FirefoxProfile = os.Getenv("USERPROFILE") + "\\AppData\\Roaming\\Mozilla\\Firefox\\Profiles"
<mask> CertutilInstallHelp = "<certutil unsupported on Windows>"
<mask> NSSBrowsers = "Firefox"
<mask> )
<mask>
</s> Offer a less confusing warning about Firefox on Windows </s> remove CertutilInstallHelp = "<certutil unsupported on Windows>"
</s> add CertutilInstallHelp = "" // certutil unsupported on Windows | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e5f9c16f8c95dfc6327b5e988d03a6dcbfbe0e9f | truststore_windows.go | |
CertutilInstallHelp = "" // certutil unsupported on Windows | <mask>
<mask> var (
<mask> FirefoxPath = "C:\\Program Files\\Mozilla Firefox"
<mask> FirefoxProfile = os.Getenv("USERPROFILE") + "\\AppData\\Roaming\\Mozilla\\Firefox\\Profiles"
<mask> CertutilInstallHelp = "<certutil unsupported on Windows>"
<mask> NSSBrowsers = "Firefox"
<mask> )
<mask>
<mask> var (
<mask> modcrypt32 = syscall.NewLazyDLL("crypt32.dll")
</s> Offer a less confusing warning about Firefox on Windows </s> remove FirefoxPath = "C:\\Program Files\\Mozilla Firefox"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/e5f9c16f8c95dfc6327b5e988d03a6dcbfbe0e9f | truststore_windows.go |
var err error
certutilPath, err = exec.LookPath("certutil") | <mask> }
<mask>
<mask> switch runtime.GOOS {
<mask> case "darwin":
<mask> out, err := exec.Command("brew", "--prefix", "nss").Output()
<mask> if err != nil {
<mask> return
<mask> }
<mask> certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
<mask>
</s> nss: use certutil from $PATH if found on macOS (#71)
Fixes #70
Thanks to @hostep for testing and fixing the patch. </s> remove certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
_, err = os.Stat(certutilPath)
</s> add </s> remove return
</s> add var out []byte
out, err = exec.Command("brew", "--prefix", "nss").Output()
if err != nil {
return
}
certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
_, err = os.Stat(certutilPath) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/fcebdc9845560b3945005932dfc0651ac06d6b98 | truststore_nss.go |
var out []byte
out, err = exec.Command("brew", "--prefix", "nss").Output()
if err != nil {
return
}
certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
_, err = os.Stat(certutilPath) | <mask> switch runtime.GOOS {
<mask> case "darwin":
<mask> out, err := exec.Command("brew", "--prefix", "nss").Output()
<mask> if err != nil {
<mask> return
<mask> }
<mask> certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
<mask>
<mask> _, err = os.Stat(certutilPath)
<mask> hasCertutil = err == nil
</s> nss: use certutil from $PATH if found on macOS (#71)
Fixes #70
Thanks to @hostep for testing and fixing the patch. </s> remove out, err := exec.Command("brew", "--prefix", "nss").Output()
</s> add var err error
certutilPath, err = exec.LookPath("certutil") </s> remove certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
_, err = os.Stat(certutilPath)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/fcebdc9845560b3945005932dfc0651ac06d6b98 | truststore_nss.go |
<mask> out, err := exec.Command("brew", "--prefix", "nss").Output()
<mask> if err != nil {
<mask> return
<mask> }
<mask> certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
<mask>
<mask> _, err = os.Stat(certutilPath)
<mask> hasCertutil = err == nil
<mask>
<mask> case "linux":
<mask> var err error
<mask> certutilPath, err = exec.LookPath("certutil")
</s> nss: use certutil from $PATH if found on macOS (#71)
Fixes #70
Thanks to @hostep for testing and fixing the patch. </s> remove out, err := exec.Command("brew", "--prefix", "nss").Output()
</s> add var err error
certutilPath, err = exec.LookPath("certutil") </s> remove return
</s> add var out []byte
out, err = exec.Command("brew", "--prefix", "nss").Output()
if err != nil {
return
}
certutilPath = filepath.Join(strings.TrimSpace(string(out)), "bin", "certutil")
_, err = os.Stat(certutilPath) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/FiloSottile/mkcert/commit/fcebdc9845560b3945005932dfc0651ac06d6b98 | truststore_nss.go | |
stdpath "path" | <mask>
<mask> import (
<mask> "github.com/alist-org/alist/v3/internal/model"
<mask> "github.com/alist-org/alist/v3/internal/sign"
<mask> )
<mask>
<mask> func Sign(obj model.Obj, parent string, encrypt bool) string {
<mask> if obj.IsDir() || !encrypt {
<mask> return ""
<mask> }
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove func Sign(obj model.Obj, encrypt bool) string {
</s> add func Sign(obj model.Obj, parent string, encrypt bool) string { </s> remove return sign.Sign(obj.GetName())
</s> add return sign.Sign(stdpath.Join(parent, obj.GetName())) </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove stdpath "path"
</s> add </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/common/sign.go |
func Sign(obj model.Obj, parent string, encrypt bool) string { | <mask> "github.com/alist-org/alist/v3/internal/model"
<mask> "github.com/alist-org/alist/v3/internal/sign"
<mask> )
<mask>
<mask> func Sign(obj model.Obj, encrypt bool) string {
<mask> if obj.IsDir() || !encrypt {
<mask> return ""
<mask> }
<mask> return sign.Sign(obj.GetName())
<mask> }
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove return sign.Sign(obj.GetName())
</s> add return sign.Sign(stdpath.Join(parent, obj.GetName())) </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/common/sign.go |
return sign.Sign(stdpath.Join(parent, obj.GetName())) | <mask> func Sign(obj model.Obj, encrypt bool) string {
<mask> if obj.IsDir() || !encrypt {
<mask> return ""
<mask> }
<mask> return sign.Sign(obj.GetName())
<mask> }
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove func Sign(obj model.Obj, encrypt bool) string {
</s> add func Sign(obj model.Obj, parent string, encrypt bool) string { </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/common/sign.go |
sign.Sign(rawPath)) | <mask> if !ok {
<mask> URL := fmt.Sprintf("%s%s?sign=%s",
<mask> strings.Split(downProxyUrl, "\n")[0],
<mask> utils.EncodePath(rawPath, true),
<mask> sign.Sign(filename))
<mask> c.Redirect(302, URL)
<mask> return
<mask> }
<mask> }
<mask> link, file, err := fs.Link(c, rawPath, model.LinkArgs{
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/down.go |
utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), | <mask> if storage.Config().OnlyLocal {
<mask> common.SuccessResp(c, model.Link{
<mask> URL: fmt.Sprintf("%s/p%s?d&sign=%s",
<mask> common.GetApiUrl(c.Request),
<mask> utils.EncodePath(req.Path, true),
<mask> sign.Sign(stdpath.Base(rawPath))),
<mask> })
<mask> return
<mask> }
<mask> link, _, err := fs.Link(c, rawPath, model.LinkArgs{IP: c.ClientIP()})
<mask> if err != nil {
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsmanage.go |
Content: toObjResp(objs, req.Path, isEncrypt(meta, req.Path)), | <mask> if err == nil {
<mask> provider = storage.GetStorage().Driver
<mask> }
<mask> common.SuccessResp(c, FsListResp{
<mask> Content: toObjResp(objs, isEncrypt(meta, req.Path)),
<mask> Total: int64(total),
<mask> Readme: getReadme(meta, req.Path),
<mask> Write: user.CanWrite() || canWrite(meta, req.Path),
<mask> Provider: provider,
<mask> })
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove Sign: common.Sign(obj, isEncrypt(meta, req.Path)),
</s> add Sign: common.Sign(obj, parentPath, isEncrypt(meta, req.Path)), </s> remove Related: toObjResp(related, isEncrypt(parentMeta, parentPath)),
</s> add Related: toObjResp(related, parentPath, isEncrypt(parentMeta, parentPath)), </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { | <mask> }
<mask> return total, objs[start:end]
<mask> }
<mask>
<mask> func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
<mask> var resp []ObjResp
<mask> for _, obj := range objs {
<mask> thumb := ""
<mask> if t, ok := obj.(model.Thumb); ok {
<mask> thumb = t.Thumb()
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove func Sign(obj model.Obj, encrypt bool) string {
</s> add func Sign(obj model.Obj, parent string, encrypt bool) string { </s> remove return sign.Sign(obj.GetName())
</s> add return sign.Sign(stdpath.Join(parent, obj.GetName())) </s> remove Related: toObjResp(related, isEncrypt(parentMeta, parentPath)),
</s> add Related: toObjResp(related, parentPath, isEncrypt(parentMeta, parentPath)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
Sign: common.Sign(obj, parent, encrypt), | <mask> Name: obj.GetName(),
<mask> Size: obj.GetSize(),
<mask> IsDir: obj.IsDir(),
<mask> Modified: obj.ModTime(),
<mask> Sign: common.Sign(obj, encrypt),
<mask> Thumb: thumb,
<mask> Type: tp,
<mask> })
<mask> }
<mask> return resp
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove Sign: common.Sign(obj, isEncrypt(meta, req.Path)),
</s> add Sign: common.Sign(obj, parentPath, isEncrypt(meta, req.Path)), </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove return sign.Sign(obj.GetName())
</s> add return sign.Sign(stdpath.Join(parent, obj.GetName())) </s> remove Related: toObjResp(related, isEncrypt(parentMeta, parentPath)),
</s> add Related: toObjResp(related, parentPath, isEncrypt(parentMeta, parentPath)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
sign.Sign(req.Path)) | <mask> if storage.GetStorage().DownProxyUrl != "" {
<mask> rawURL = fmt.Sprintf("%s%s?sign=%s",
<mask> strings.Split(storage.GetStorage().DownProxyUrl, "\n")[0],
<mask> utils.EncodePath(req.Path, true),
<mask> sign.Sign(obj.GetName()))
<mask> } else {
<mask> rawURL = fmt.Sprintf("%s/p%s?sign=%s",
<mask> common.GetApiUrl(c.Request),
<mask> utils.EncodePath(req.Path, true),
<mask> sign.Sign(obj.GetName()))
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
sign.Sign(req.Path)) | <mask> } else {
<mask> rawURL = fmt.Sprintf("%s/p%s?sign=%s",
<mask> common.GetApiUrl(c.Request),
<mask> utils.EncodePath(req.Path, true),
<mask> sign.Sign(obj.GetName()))
<mask> }
<mask> } else {
<mask> // file have raw url
<mask> if u, ok := obj.(model.URL); ok {
<mask> rawURL = u.URL()
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
Sign: common.Sign(obj, parentPath, isEncrypt(meta, req.Path)), | <mask> Name: obj.GetName(),
<mask> Size: obj.GetSize(),
<mask> IsDir: obj.IsDir(),
<mask> Modified: obj.ModTime(),
<mask> Sign: common.Sign(obj, isEncrypt(meta, req.Path)),
<mask> Type: utils.GetFileType(obj.GetName()),
<mask> },
<mask> RawURL: rawURL,
<mask> Readme: getReadme(meta, req.Path),
<mask> Provider: provider,
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove Sign: common.Sign(obj, encrypt),
</s> add Sign: common.Sign(obj, parent, encrypt), </s> remove Related: toObjResp(related, isEncrypt(parentMeta, parentPath)),
</s> add Related: toObjResp(related, parentPath, isEncrypt(parentMeta, parentPath)), </s> remove Content: toObjResp(objs, isEncrypt(meta, req.Path)),
</s> add Content: toObjResp(objs, req.Path, isEncrypt(meta, req.Path)), </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
Related: toObjResp(related, parentPath, isEncrypt(parentMeta, parentPath)), | <mask> },
<mask> RawURL: rawURL,
<mask> Readme: getReadme(meta, req.Path),
<mask> Provider: provider,
<mask> Related: toObjResp(related, isEncrypt(parentMeta, parentPath)),
<mask> })
<mask> }
<mask>
<mask> func filterRelated(objs []model.Obj, obj model.Obj) []model.Obj {
<mask> var related []model.Obj
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove Sign: common.Sign(obj, isEncrypt(meta, req.Path)),
</s> add Sign: common.Sign(obj, parentPath, isEncrypt(meta, req.Path)), </s> remove Content: toObjResp(objs, isEncrypt(meta, req.Path)),
</s> add Content: toObjResp(objs, req.Path, isEncrypt(meta, req.Path)), </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { </s> remove func Sign(obj model.Obj, encrypt bool) string {
</s> add func Sign(obj model.Obj, parent string, encrypt bool) string { </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/handles/fsread.go |
<mask> package middlewares
<mask>
<mask> import (
<mask> stdpath "path"
<mask> "strings"
<mask>
<mask> "github.com/alist-org/alist/v3/internal/db"
<mask> "github.com/alist-org/alist/v3/internal/errs"
<mask> "github.com/alist-org/alist/v3/internal/model"
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove func Sign(obj model.Obj, encrypt bool) string {
</s> add func Sign(obj model.Obj, parent string, encrypt bool) string { </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) </s> remove filename := stdpath.Base(rawPath)
</s> add | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/middlewares/down.go | |
<mask>
<mask> func Down(c *gin.Context) {
<mask> rawPath := parsePath(c.Param("path"))
<mask> c.Set("path", rawPath)
<mask> filename := stdpath.Base(rawPath)
<mask> meta, err := db.GetNearestMeta(rawPath)
<mask> if err != nil {
<mask> if !errors.Is(errors.Cause(err), errs.MetaNotFound) {
<mask> common.ErrorResp(c, err, 500, true)
<mask> return
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove func toObjResp(objs []model.Obj, encrypt bool) []ObjResp {
</s> add func toObjResp(objs []model.Obj, parent string, encrypt bool) []ObjResp { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/middlewares/down.go | |
err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | <mask> c.Set("meta", meta)
<mask> // verify sign
<mask> if needSign(meta, rawPath) {
<mask> s := c.Query("sign")
<mask> err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
<mask> if err != nil {
<mask> common.ErrorResp(c, err, 401)
<mask> c.Abort()
<mask> return
<mask> }
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove filename := stdpath.Base(rawPath)
</s> add </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(path.Base(reqPath)))
</s> add sign.Sign(reqPath)) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/middlewares/down.go |
sign.Sign(reqPath)) | <mask> } else if storage.Config().MustProxy() || storage.GetStorage().WebdavProxy() {
<mask> u := fmt.Sprintf("%s/p%s?sign=%s",
<mask> common.GetApiUrl(r),
<mask> utils.EncodePath(reqPath, true),
<mask> sign.Sign(path.Base(reqPath)))
<mask> w.Header().Set("Cache-Control", "max-age=0, no-cache, no-store, must-revalidate")
<mask> http.Redirect(w, r, u, 302)
<mask> } else {
<mask> link, _, err := fs.Link(ctx, reqPath, model.LinkArgs{IP: utils.ClientIP(r)})
<mask> if err != nil {
</s> fix!: sign with the raw path instead of filename (#2258) </s> remove utils.EncodePath(req.Path, true),
sign.Sign(stdpath.Base(rawPath))),
</s> add utils.EncodePath(rawPath, true),
sign.Sign(rawPath)), </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(obj.GetName()))
</s> add sign.Sign(req.Path)) </s> remove sign.Sign(filename))
</s> add sign.Sign(rawPath)) </s> remove err = sign.Verify(filename, strings.TrimSuffix(s, "/"))
</s> add err = sign.Verify(rawPath, strings.TrimSuffix(s, "/")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/00de9bf16d3ade4111ed4a3390d8f6dca9ec2b88 | server/webdav/webdav.go |
query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | <mask> endpoint, _ := url.Parse("https://tb28.trainbit.com/api/upload/send_raw/")
<mask> query := &url.Values{}
<mask> query.Add("q", strings.Split(dstDir.GetID(), "_")[1])
<mask> query.Add("guid", guid)
<mask> query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
<mask> endpoint.RawQuery = query.Encode()
<mask> var total int64
<mask> total = 0
<mask> progressReader := &ProgressReader{
<mask> stream,
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
</s> add name = object["name"].(string) + object["ext"].(string) </s> remove rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
</s> add return filename </s> remove index := strings.LastIndex(filename, ".delete_suffix.")
</s> add index := strings.LastIndex(filename, ".delete_suffix") </s> remove return strings.Join([]string{filename, ".delete_suffix."}, "")
</s> add return filename + ".delete_suffix" </s> remove filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/driver.go |
<mask> return apiExpiredate, guid, nil
<mask> }
<mask>
<mask> func local2provider(filename string, isFolder bool) string {
<mask> filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
<mask> filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
<mask> filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
<mask> filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
<mask> filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
<mask> filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
<mask> filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
<mask> filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
<mask> filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
<mask> if isFolder {
<mask> return filename
<mask> }
<mask> return strings.Join([]string{filename, ".delete_suffix."}, "")
<mask> }
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
</s> add return filename </s> remove return strings.Join([]string{filename, ".delete_suffix."}, "")
</s> add return filename + ".delete_suffix" </s> remove index := strings.LastIndex(filename, ".delete_suffix.")
</s> add index := strings.LastIndex(filename, ".delete_suffix") </s> remove name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
</s> add name = object["name"].(string) + object["ext"].(string) </s> remove query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
</s> add query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/util.go | |
return filename + ".delete_suffix" | <mask> filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
<mask> if isFolder {
<mask> return filename
<mask> }
<mask> return strings.Join([]string{filename, ".delete_suffix."}, "")
<mask> }
<mask>
<mask> func provider2local(filename string) string {
<mask> index := strings.LastIndex(filename, ".delete_suffix.")
<mask> if index != -1 {
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove index := strings.LastIndex(filename, ".delete_suffix.")
</s> add index := strings.LastIndex(filename, ".delete_suffix") </s> remove filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
</s> add </s> remove rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
</s> add return filename </s> remove name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
</s> add name = object["name"].(string) + object["ext"].(string) </s> remove query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
</s> add query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/util.go |
index := strings.LastIndex(filename, ".delete_suffix") | <mask> return strings.Join([]string{filename, ".delete_suffix."}, "")
<mask> }
<mask>
<mask> func provider2local(filename string) string {
<mask> index := strings.LastIndex(filename, ".delete_suffix.")
<mask> if index != -1 {
<mask> filename = filename[:index]
<mask> }
<mask> rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
</s> add return filename </s> remove return strings.Join([]string{filename, ".delete_suffix."}, "")
</s> add return filename + ".delete_suffix" </s> remove filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
</s> add </s> remove name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
</s> add name = object["name"].(string) + object["ext"].(string) </s> remove query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
</s> add query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/util.go |
return filename | <mask> index := strings.LastIndex(filename, ".delete_suffix.")
<mask> if index != -1 {
<mask> filename = filename[:index]
<mask> }
<mask> rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
<mask> rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
<mask> return rawName
<mask> }
<mask>
<mask> func parseRawFileObject(rawObject []any) ([]model.Obj, error) {
<mask> objectList := make([]model.Obj, 0)
<mask> for _, each := range rawObject {
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove index := strings.LastIndex(filename, ".delete_suffix.")
</s> add index := strings.LastIndex(filename, ".delete_suffix") </s> remove filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
</s> add </s> remove return strings.Join([]string{filename, ".delete_suffix."}, "")
</s> add return filename + ".delete_suffix" </s> remove name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
</s> add name = object["name"].(string) + object["ext"].(string) </s> remove query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
</s> add query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/util.go |
name = object["name"].(string) + object["ext"].(string) | <mask> var name string
<mask> if isFolder {
<mask> name = object["name"].(string)
<mask> } else {
<mask> name = strings.Join([]string{object["name"].(string), object["ext"].(string)}, ".")
<mask> }
<mask> modified, err := time.Parse("2006/01/02 15:04:05", object["modified"].(string))
<mask> if err != nil {
<mask> return nil, err
<mask> }
</s> fix(trainbit): remove unnecessary operation (#3881) </s> remove return strings.Join([]string{filename, ".delete_suffix."}, "")
</s> add return filename + ".delete_suffix" </s> remove index := strings.LastIndex(filename, ".delete_suffix.")
</s> add index := strings.LastIndex(filename, ".delete_suffix") </s> remove filename = strings.Replace(filename, "%", url.QueryEscape("%"), -1)
filename = strings.Replace(filename, "/", url.QueryEscape("/"), -1)
filename = strings.Replace(filename, ":", url.QueryEscape(":"), -1)
filename = strings.Replace(filename, "*", url.QueryEscape("*"), -1)
filename = strings.Replace(filename, "?", url.QueryEscape("?"), -1)
filename = strings.Replace(filename, "\"", url.QueryEscape("\""), -1)
filename = strings.Replace(filename, "<", url.QueryEscape("<"), -1)
filename = strings.Replace(filename, ">", url.QueryEscape(">"), -1)
filename = strings.Replace(filename, "|", url.QueryEscape("|"), -1)
</s> add </s> remove rawName := strings.Replace(filename, url.QueryEscape("/"), "/", -1)
rawName = strings.Replace(rawName, url.QueryEscape(":"), ":", -1)
rawName = strings.Replace(rawName, url.QueryEscape("*"), "*", -1)
rawName = strings.Replace(rawName, url.QueryEscape("?"), "?", -1)
rawName = strings.Replace(rawName, url.QueryEscape("\""), "\"", -1)
rawName = strings.Replace(rawName, url.QueryEscape("<"), "<", -1)
rawName = strings.Replace(rawName, url.QueryEscape(">"), ">", -1)
rawName = strings.Replace(rawName, url.QueryEscape("|"), "|", -1)
rawName = strings.Replace(rawName, url.QueryEscape("%"), "%", -1)
return rawName
</s> add return filename </s> remove query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false)))
</s> add query.Add("name", url.QueryEscape(local2provider(stream.GetName(), false) + ".")) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/023107226c9970cf1cffffa29ed629d613f29bac | drivers/trainbit/util.go |
"strings" | <mask> "io"
<mask> "math"
<mask> "net/http"
<mask>
<mask> "github.com/alist-org/alist/v3/drivers/base"
<mask> "github.com/alist-org/alist/v3/internal/driver"
<mask> "github.com/alist-org/alist/v3/internal/errs"
</s> feat(aliyundrive_open): add internal upload (aliyun ECS for Beijing area only) (#3775) </s> remove req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(stream, DEFAULT))
</s> add uploadUrl := partInfo.UploadUrl
if d.InternalUpload {
//Replace a known public Host with an internal Host
uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
}
req, err := http.NewRequest("PUT", uploadUrl, io.LimitReader(stream, DEFAULT)) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02d0aef6119235fdf811decfda33c7a3059b6c20 | drivers/aliyundrive_open/driver.go |
uploadUrl := partInfo.UploadUrl
if d.InternalUpload {
//Replace a known public Host with an internal Host
uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
}
req, err := http.NewRequest("PUT", uploadUrl, io.LimitReader(stream, DEFAULT)) | <mask> for i, partInfo := range createResp.PartInfoList {
<mask> if utils.IsCanceled(ctx) {
<mask> return ctx.Err()
<mask> }
<mask> req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(stream, DEFAULT))
<mask> if err != nil {
<mask> return err
<mask> }
<mask> req = req.WithContext(ctx)
<mask> res, err := base.HttpClient.Do(req)
</s> feat(aliyundrive_open): add internal upload (aliyun ECS for Beijing area only) (#3775) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02d0aef6119235fdf811decfda33c7a3059b6c20 | drivers/aliyundrive_open/driver.go |
InternalUpload bool `json:"internal_upload" help:"If you are using Aliyun ECS in Beijing, you can turn it on to boost the upload speed"` | <mask> OauthTokenURL string `json:"oauth_token_url" default:"https://api.nn.ci/alist/ali_open/token"`
<mask> ClientID string `json:"client_id" required:"false" help:"Keep it empty if you don't have one"`
<mask> ClientSecret string `json:"client_secret" required:"false" help:"Keep it empty if you don't have one"`
<mask> RemoveWay string `json:"remove_way" required:"true" type:"select" options:"trash,delete"`
<mask> }
<mask>
<mask> var config = driver.Config{
<mask> Name: "AliyundriveOpen",
<mask> LocalSort: false,
</s> feat(aliyundrive_open): add internal upload (aliyun ECS for Beijing area only) (#3775) </s> remove req, err := http.NewRequest("PUT", partInfo.UploadUrl, io.LimitReader(stream, DEFAULT))
</s> add uploadUrl := partInfo.UploadUrl
if d.InternalUpload {
//Replace a known public Host with an internal Host
uploadUrl = strings.ReplaceAll(uploadUrl, "https://cn-beijing-data.aliyundrive.net/", "http://ccp-bj29-bj-1592982087.oss-cn-beijing-internal.aliyuncs.com/")
}
req, err := http.NewRequest("PUT", uploadUrl, io.LimitReader(stream, DEFAULT)) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02d0aef6119235fdf811decfda33c7a3059b6c20 | drivers/aliyundrive_open/meta.go |
Page int `json:"page_index" form:"page"`
PerPage int `json:"page_size" form:"per_page"` | <mask> package common
<mask>
<mask> type PageReq struct {
<mask> PageIndex int `json:"page_index" form:"page_index"`
<mask> PageSize int `json:"page_size" form:"page_size"`
<mask> }
<mask>
<mask> const MaxUint = ^uint(0)
<mask> const MinUint = 0
<mask> const MaxInt = int(MaxUint >> 1)
</s> chore: rename some request param </s> remove if p.PageIndex < 1 {
p.PageIndex = 1
</s> add if p.Page < 1 {
p.Page = 1 </s> remove if p.PageSize < 1 {
p.PageSize = MaxInt
</s> add if p.PerPage < 1 {
p.PerPage = MaxInt </s> remove type FsGetOrLinkReq struct {
</s> add type FsGetReq struct { </s> remove pageIndex, pageSize := req.PageIndex, req.PageSize
</s> add pageIndex, pageSize := req.Page, req.PerPage </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq | [
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/common/req.go |
if p.Page < 1 {
p.Page = 1 | <mask> const MaxInt = int(MaxUint >> 1)
<mask> const MinInt = -MaxInt - 1
<mask>
<mask> func (p *PageReq) Validate() {
<mask> if p.PageIndex < 1 {
<mask> p.PageIndex = 1
<mask> }
<mask> if p.PageSize < 1 {
<mask> p.PageSize = MaxInt
<mask> }
<mask> }
</s> chore: rename some request param </s> remove if p.PageSize < 1 {
p.PageSize = MaxInt
</s> add if p.PerPage < 1 {
p.PerPage = MaxInt </s> remove PageIndex int `json:"page_index" form:"page_index"`
PageSize int `json:"page_size" form:"page_size"`
</s> add Page int `json:"page_index" form:"page"`
PerPage int `json:"page_size" form:"per_page"` </s> remove pageIndex, pageSize := req.PageIndex, req.PageSize
</s> add pageIndex, pageSize := req.Page, req.PerPage </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/common/req.go |
if p.PerPage < 1 {
p.PerPage = MaxInt | <mask> func (p *PageReq) Validate() {
<mask> if p.PageIndex < 1 {
<mask> p.PageIndex = 1
<mask> }
<mask> if p.PageSize < 1 {
<mask> p.PageSize = MaxInt
<mask> }
<mask> }
</s> chore: rename some request param </s> remove if p.PageIndex < 1 {
p.PageIndex = 1
</s> add if p.Page < 1 {
p.Page = 1 </s> remove PageIndex int `json:"page_index" form:"page_index"`
PageSize int `json:"page_size" form:"page_size"`
</s> add Page int `json:"page_index" form:"page"`
PerPage int `json:"page_size" form:"per_page"` </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove pageIndex, pageSize := req.PageIndex, req.PageSize
</s> add pageIndex, pageSize := req.Page, req.PerPage | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/common/req.go |
// Link return real link, just for proxy program, it may contain cookie, so just allowed for admin | <mask> }
<mask> common.SuccessResp(c)
<mask> }
<mask>
<mask> // Link return real link, just for proxy program, it may contain cookie
<mask> func Link(c *gin.Context) {
<mask> var req FsGetOrLinkReq
<mask> if err := c.ShouldBind(&req); err != nil {
<mask> common.ErrorResp(c, err, 400)
<mask> return
</s> chore: rename some request param </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/fsmanage.go |
var req MkdirOrLinkReq | <mask> }
<mask>
<mask> // Link return real link, just for proxy program, it may contain cookie
<mask> func Link(c *gin.Context) {
<mask> var req FsGetOrLinkReq
<mask> if err := c.ShouldBind(&req); err != nil {
<mask> common.ErrorResp(c, err, 400)
<mask> return
<mask> }
<mask> user := c.MustGet("user").(*model.User)
</s> chore: rename some request param </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/fsmanage.go |
pageIndex, pageSize := req.Page, req.PerPage | <mask> return meta.Password == password
<mask> }
<mask>
<mask> func pagination(objs []model.Obj, req *common.PageReq) (int, []model.Obj) {
<mask> pageIndex, pageSize := req.PageIndex, req.PageSize
<mask> total := len(objs)
<mask> start := (pageIndex - 1) * pageSize
<mask> if start > total {
<mask> return total, []model.Obj{}
<mask> }
</s> chore: rename some request param </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/fsread.go |
type FsGetReq struct { | <mask> }
<mask> return resp
<mask> }
<mask>
<mask> type FsGetOrLinkReq struct {
<mask> Path string `json:"path" form:"path"`
<mask> Password string `json:"password" form:"password"`
<mask> }
<mask>
<mask> type FsGetResp struct {
</s> chore: rename some request param </s> remove PageIndex int `json:"page_index" form:"page_index"`
PageSize int `json:"page_size" form:"page_size"`
</s> add Page int `json:"page_index" form:"page"`
PerPage int `json:"page_size" form:"per_page"` </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin </s> remove if p.PageSize < 1 {
p.PageSize = MaxInt
</s> add if p.PerPage < 1 {
p.PerPage = MaxInt | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/fsread.go |
var req FsGetReq | <mask> Related []ObjResp `json:"related"`
<mask> }
<mask>
<mask> func FsGet(c *gin.Context) {
<mask> var req FsGetOrLinkReq
<mask> if err := c.ShouldBind(&req); err != nil {
<mask> common.ErrorResp(c, err, 400)
<mask> return
<mask> }
<mask> user := c.MustGet("user").(*model.User)
</s> chore: rename some request param </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/fsread.go |
metas, total, err := db.GetMetas(req.Page, req.PerPage) | <mask> return
<mask> }
<mask> req.Validate()
<mask> log.Debugf("%+v", req)
<mask> metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
<mask> if err != nil {
<mask> common.ErrorResp(c, err, 500, true)
<mask> return
<mask> }
<mask> common.SuccessResp(c, common.PageResp{
</s> chore: rename some request param </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/meta.go |
storages, total, err := db.GetStorages(req.Page, req.PerPage) | <mask> return
<mask> }
<mask> req.Validate()
<mask> log.Debugf("%+v", req)
<mask> storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
<mask> if err != nil {
<mask> common.ErrorResp(c, err, 500)
<mask> return
<mask> }
<mask> common.SuccessResp(c, common.PageResp{
</s> chore: rename some request param </s> remove users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
</s> add users, total, err := db.GetUsers(req.Page, req.PerPage) </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/storage.go |
users, total, err := db.GetUsers(req.Page, req.PerPage) | <mask> return
<mask> }
<mask> req.Validate()
<mask> log.Debugf("%+v", req)
<mask> users, total, err := db.GetUsers(req.PageIndex, req.PageSize)
<mask> if err != nil {
<mask> common.ErrorResp(c, err, 500, true)
<mask> return
<mask> }
<mask> common.SuccessResp(c, common.PageResp{
</s> chore: rename some request param </s> remove metas, total, err := db.GetMetas(req.PageIndex, req.PageSize)
</s> add metas, total, err := db.GetMetas(req.Page, req.PerPage) </s> remove storages, total, err := db.GetStorages(req.PageIndex, req.PageSize)
</s> add storages, total, err := db.GetStorages(req.Page, req.PerPage) </s> remove var req FsGetOrLinkReq
</s> add var req FsGetReq </s> remove var req FsGetOrLinkReq
</s> add var req MkdirOrLinkReq </s> remove // Link return real link, just for proxy program, it may contain cookie
</s> add // Link return real link, just for proxy program, it may contain cookie, so just allowed for admin | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/02e2c809a8ac439a8ffcc418e0b38d58d8e56416 | server/handles/user.go |
"github.com/alist-org/alist/v3/pkg/utils" | <mask> "github.com/alist-org/alist/v3/cmd/flags"
<mask> _ "github.com/alist-org/alist/v3/drivers"
<mask> "github.com/alist-org/alist/v3/internal/bootstrap"
<mask> "github.com/alist-org/alist/v3/internal/conf"
<mask> "github.com/alist-org/alist/v3/server"
<mask> "github.com/gin-gonic/gin"
<mask> log "github.com/sirupsen/logrus"
<mask> "github.com/spf13/cobra"
<mask> )
<mask>
</s> feat: use `lumberjack` for log rotate </s> remove rotatelogs "github.com/lestrrat-go/file-rotatelogs"
</s> add "github.com/alist-org/alist/v3/pkg/utils"
"github.com/natefinch/lumberjack" </s> remove log "github.com/sirupsen/logrus"
</s> add "github.com/alist-org/alist/v3/pkg/utils" </s> remove "time"
</s> add </s> remove log "github.com/sirupsen/logrus"
</s> add "github.com/alist-org/alist/v3/pkg/utils" </s> remove logrus.SetFormatter(&logrus.TextFormatter{
</s> add formatter := logrus.TextFormatter{ | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Infof("start server @ %s", base) | <mask> r := gin.New()
<mask> r.Use(gin.LoggerWithWriter(log.StandardLogger().Out), gin.RecoveryWithWriter(log.StandardLogger().Out))
<mask> server.Init(r)
<mask> base := fmt.Sprintf("%s:%d", conf.Conf.Address, conf.Conf.Port)
<mask> log.Infof("start server @ %s", base)
<mask> srv := &http.Server{Addr: base, Handler: r}
<mask> go func() {
<mask> var err error
<mask> if conf.Conf.Scheme.Https {
<mask> //err = r.RunTLS(base, conf.Conf.Scheme.CertFile, conf.Conf.Scheme.KeyFile)
</s> feat: use `lumberjack` for log rotate </s> remove var (
writer *rotatelogs.RotateLogs
err error
)
if logConfig.Name != "" {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithLinkName(logConfig.Name),
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
} else {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
}
if err != nil {
logrus.Fatalf("failed to create rotate logrus: %s", err)
}
logrus.SetOutput(writer)
</s> add logrus.SetOutput(&lumberjack.Logger{
Filename: logConfig.Name,
MaxSize: logConfig.MaxSize, // megabytes
MaxBackups: logConfig.MaxBackups,
MaxAge: logConfig.MaxAge, //days
Compress: logConfig.Compress, // disabled by default
}) </s> remove log.Errorf("failed to start: %s", err.Error())
</s> add utils.Log.Errorf("failed to start: %s", err.Error()) </s> remove log "github.com/sirupsen/logrus"
</s> add "github.com/alist-org/alist/v3/pkg/utils" </s> remove log.Errorf("failed to init aria2 client: %+v", err)
</s> add utils.Log.Errorf("failed to init aria2 client: %+v", err) </s> remove log.Fatalf("failed get enabled storages: %+v", err)
</s> add utils.Log.Fatalf("failed get enabled storages: %+v", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Errorf("failed to start: %s", err.Error()) | <mask> } else {
<mask> err = srv.ListenAndServe()
<mask> }
<mask> if err != nil && err != http.ErrServerClosed {
<mask> log.Errorf("failed to start: %s", err.Error())
<mask> }
<mask> }()
<mask> // Wait for interrupt signal to gracefully shutdown the server with
<mask> // a timeout of 5 seconds.
<mask> quit := make(chan os.Signal)
</s> feat: use `lumberjack` for log rotate </s> remove log.Fatal("Server Shutdown:", err)
</s> add utils.Log.Fatal("Server Shutdown:", err) </s> remove var (
writer *rotatelogs.RotateLogs
err error
)
if logConfig.Name != "" {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithLinkName(logConfig.Name),
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
} else {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
}
if err != nil {
logrus.Fatalf("failed to create rotate logrus: %s", err)
}
logrus.SetOutput(writer)
</s> add logrus.SetOutput(&lumberjack.Logger{
Filename: logConfig.Name,
MaxSize: logConfig.MaxSize, // megabytes
MaxBackups: logConfig.MaxBackups,
MaxAge: logConfig.MaxAge, //days
Compress: logConfig.Compress, // disabled by default
}) </s> remove log.Errorf("failed to init aria2 client: %+v", err)
</s> add utils.Log.Errorf("failed to init aria2 client: %+v", err) </s> remove log.Fatalf("failed get enabled storages: %+v", err)
</s> add utils.Log.Fatalf("failed get enabled storages: %+v", err) </s> remove log.Errorf("failed get enabled storages: %+v", err)
</s> add utils.Log.Errorf("failed get enabled storages: %+v", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Println("Shutdown Server ...") | <mask> // kill -2 is syscall.SIGINT
<mask> // kill -9 is syscall. SIGKILL but can"t be catch, so don't need add it
<mask> signal.Notify(quit, syscall.SIGINT, syscall.SIGTERM)
<mask> <-quit
<mask> log.Println("Shutdown Server ...")
<mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
<mask> defer cancel()
<mask> if err := srv.Shutdown(ctx); err != nil {
<mask> log.Fatal("Server Shutdown:", err)
</s> feat: use `lumberjack` for log rotate </s> remove log.Fatal("Server Shutdown:", err)
</s> add utils.Log.Fatal("Server Shutdown:", err) </s> remove log.Fatalf("failed get enabled storages: %+v", err)
</s> add utils.Log.Fatalf("failed get enabled storages: %+v", err) </s> remove log.Errorf("failed get enabled storages: %+v", err)
</s> add utils.Log.Errorf("failed get enabled storages: %+v", err) </s> remove log "github.com/sirupsen/logrus"
</s> add "github.com/alist-org/alist/v3/pkg/utils" </s> remove var (
writer *rotatelogs.RotateLogs
err error
)
if logConfig.Name != "" {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithLinkName(logConfig.Name),
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
} else {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
}
if err != nil {
logrus.Fatalf("failed to create rotate logrus: %s", err)
}
logrus.SetOutput(writer)
</s> add logrus.SetOutput(&lumberjack.Logger{
Filename: logConfig.Name,
MaxSize: logConfig.MaxSize, // megabytes
MaxBackups: logConfig.MaxBackups,
MaxAge: logConfig.MaxAge, //days
Compress: logConfig.Compress, // disabled by default
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Fatal("Server Shutdown:", err) | <mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), 3*time.Second)
<mask> defer cancel()
<mask> if err := srv.Shutdown(ctx); err != nil {
<mask> log.Fatal("Server Shutdown:", err)
<mask> }
<mask> // catching ctx.Done(). timeout of 3 seconds.
<mask> select {
<mask> case <-ctx.Done():
<mask> log.Println("timeout of 3 seconds.")
</s> feat: use `lumberjack` for log rotate </s> remove log.Println("timeout of 3 seconds.")
</s> add utils.Log.Println("timeout of 3 seconds.") </s> remove log.Println("Shutdown Server ...")
</s> add utils.Log.Println("Shutdown Server ...") </s> remove log.Println("Server exiting")
</s> add utils.Log.Println("Server exiting") </s> remove log.Errorf("failed to start: %s", err.Error())
</s> add utils.Log.Errorf("failed to start: %s", err.Error()) </s> remove log.Fatalf("failed get enabled storages: %+v", err)
</s> add utils.Log.Fatalf("failed get enabled storages: %+v", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Println("timeout of 3 seconds.") | <mask> }
<mask> // catching ctx.Done(). timeout of 3 seconds.
<mask> select {
<mask> case <-ctx.Done():
<mask> log.Println("timeout of 3 seconds.")
<mask> }
<mask> log.Println("Server exiting")
<mask> },
<mask> }
<mask>
</s> feat: use `lumberjack` for log rotate </s> remove log.Println("Server exiting")
</s> add utils.Log.Println("Server exiting") </s> remove log.Fatal("Server Shutdown:", err)
</s> add utils.Log.Fatal("Server Shutdown:", err) </s> remove log.Errorf("failed to start: %s", err.Error())
</s> add utils.Log.Errorf("failed to start: %s", err.Error()) </s> remove Enable: true,
Path: "log/%Y-%m-%d-%H:%M.log",
Name: "log/log.log",
RotationTime: 24,
RotationCount: 5,
</s> add Enable: true,
Name: "log/log.log",
MaxSize: 10,
MaxBackups: 5,
MaxAge: 28, </s> remove func Log() {
log.SetOutput(logrus.StandardLogger().Out)
</s> add func setLog(l *logrus.Logger) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
utils.Log.Println("Server exiting") | <mask> select {
<mask> case <-ctx.Done():
<mask> log.Println("timeout of 3 seconds.")
<mask> }
<mask> log.Println("Server exiting")
<mask> },
<mask> }
<mask>
<mask> func init() {
<mask> rootCmd.AddCommand(serverCmd)
</s> feat: use `lumberjack` for log rotate </s> remove log.Println("timeout of 3 seconds.")
</s> add utils.Log.Println("timeout of 3 seconds.") </s> remove log.Fatal("Server Shutdown:", err)
</s> add utils.Log.Fatal("Server Shutdown:", err) </s> remove rotatelogs "github.com/lestrrat-go/file-rotatelogs"
</s> add "github.com/alist-org/alist/v3/pkg/utils"
"github.com/natefinch/lumberjack" </s> remove logrus.SetFormatter(&logrus.TextFormatter{
</s> add formatter := logrus.TextFormatter{ </s> remove func Log() {
log.SetOutput(logrus.StandardLogger().Out)
</s> add func setLog(l *logrus.Logger) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | cmd/server.go |
github.com/disintegration/imaging v1.6.2 | <mask>
<mask> require (
<mask> github.com/Xhofe/go-cache v0.0.0-20220723083548-714439c8af9a
<mask> github.com/caarlos0/env/v6 v6.9.3
<mask> github.com/gin-contrib/cors v1.3.1
<mask> github.com/gin-gonic/gin v1.8.0
<mask> github.com/golang-jwt/jwt/v4 v4.4.2
<mask> github.com/google/uuid v1.3.0
<mask> github.com/gorilla/websocket v1.5.0
</s> feat: use `lumberjack` for log rotate </s> remove github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
</s> add github.com/natefinch/lumberjack v2.0.0+incompatible </s> remove github.com/disintegration/imaging v1.6.2 // indirect
</s> add </s> remove "time"
</s> add </s> remove log "github.com/sirupsen/logrus"
</s> add "github.com/alist-org/alist/v3/pkg/utils" </s> remove logrus.SetLevel(logrus.InfoLevel)
logrus.SetReportCaller(false)
</s> add l.SetLevel(logrus.InfoLevel)
l.SetReportCaller(false) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | go.mod |
github.com/natefinch/lumberjack v2.0.0+incompatible | <mask> github.com/golang-jwt/jwt/v4 v4.4.2
<mask> github.com/google/uuid v1.3.0
<mask> github.com/gorilla/websocket v1.5.0
<mask> github.com/json-iterator/go v1.1.12
<mask> github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
<mask> github.com/pkg/errors v0.9.1
<mask> github.com/pquerna/otp v1.3.0
<mask> github.com/sirupsen/logrus v1.8.1
<mask> github.com/spf13/cobra v1.5.0
<mask> github.com/winfsp/cgofuse v1.5.0
</s> feat: use `lumberjack` for log rotate </s> remove github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
</s> add </s> remove github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
</s> add </s> remove log.Fatal("Server Shutdown:", err)
</s> add utils.Log.Fatal("Server Shutdown:", err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | go.mod |
<mask> )
<mask>
<mask> require (
<mask> github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
<mask> github.com/disintegration/imaging v1.6.2 // indirect
<mask> github.com/gin-contrib/sse v0.1.0 // indirect
<mask> github.com/go-playground/locales v0.14.0 // indirect
<mask> github.com/go-playground/universal-translator v0.18.0 // indirect
<mask> github.com/go-playground/validator/v10 v10.11.0 // indirect
<mask> github.com/go-sql-driver/mysql v1.6.0 // indirect
</s> feat: use `lumberjack` for log rotate </s> remove github.com/jonboulle/clockwork v0.3.0 // indirect
</s> add </s> remove github.com/lestrrat-go/strftime v1.0.6 // indirect
</s> add </s> remove var (
writer *rotatelogs.RotateLogs
err error
)
if logConfig.Name != "" {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithLinkName(logConfig.Name),
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
} else {
writer, err = rotatelogs.New(
logConfig.Path,
rotatelogs.WithRotationCount(logConfig.RotationCount),
rotatelogs.WithRotationTime(time.Duration(logConfig.RotationTime)*time.Hour),
)
}
if err != nil {
logrus.Fatalf("failed to create rotate logrus: %s", err)
}
logrus.SetOutput(writer)
</s> add logrus.SetOutput(&lumberjack.Logger{
Filename: logConfig.Name,
MaxSize: logConfig.MaxSize, // megabytes
MaxBackups: logConfig.MaxBackups,
MaxAge: logConfig.MaxAge, //days
Compress: logConfig.Compress, // disabled by default
}) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | go.mod | |
<mask> github.com/jackc/pgtype v1.11.0 // indirect
<mask> github.com/jackc/pgx/v4 v4.16.1 // indirect
<mask> github.com/jinzhu/inflection v1.0.0 // indirect
<mask> github.com/jinzhu/now v1.1.5 // indirect
<mask> github.com/jonboulle/clockwork v0.3.0 // indirect
<mask> github.com/leodido/go-urn v1.2.1 // indirect
<mask> github.com/lestrrat-go/strftime v1.0.6 // indirect
<mask> github.com/mattn/go-isatty v0.0.14 // indirect
<mask> github.com/mattn/go-sqlite3 v1.14.13 // indirect
<mask> github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
</s> feat: use `lumberjack` for log rotate </s> remove github.com/lestrrat-go/strftime v1.0.6 // indirect
</s> add </s> remove github.com/disintegration/imaging v1.6.2 // indirect
</s> add </s> remove github.com/jonboulle/clockwork v0.3.0 h1:9BSCMi8C+0qdApAp4auwX0RkLGUjs956h0EkuQymUhg=
github.com/jonboulle/clockwork v0.3.0/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8=
</s> add </s> remove github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc h1:RKf14vYWi2ttpEmkA4aQ3j4u9dStX2t4M8UM6qqNsG8=
github.com/lestrrat-go/envload v0.0.0-20180220234015-a3eb8ddeffcc/go.mod h1:kopuH9ugFRkIXf3YoqHKyrJ9YfUFsckUU9S7B+XP+is=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible h1:Y6sqxHMyB1D2YSzWkLibYKgg+SwmyFU9dF2hn6MdTj4=
github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible/go.mod h1:ZQnN8lSECaebrkQytbHj4xNgtg8CR7RYXnPok8e0EHA=
github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205AhTIGQQ=
github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/alist-org/alist/commit/046bbb3a4872e8bac529bba964e5b1b0846a1739 | go.mod |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.