login-validator: Try to fix solver distribution
This commit is contained in:
parent
7b1cf513a5
commit
bb7bf52433
@ -112,26 +112,36 @@ func passwd(w http.ResponseWriter, r *http.Request) {
|
||||
}
|
||||
|
||||
// Treat the solver case
|
||||
if st, err := os.Stat(path.Join(tftpDir, "shadows", initrd, "solver")); err == nil {
|
||||
fdsolv, err := os.Open(path.Join(tftpDir, "..", "solver.sh"))
|
||||
if err != nil {
|
||||
log.Println("Unable to open solver.sh:", err.Error())
|
||||
if _, err := os.Stat(path.Join(tftpDir, "shadows", initrd, "solver")); err == nil {
|
||||
if fi, err := os.Stat(path.Join(tftpDir, "..", "solver.sh")); err != nil {
|
||||
log.Println("Unable to stat solver.sh:", err.Error())
|
||||
} else {
|
||||
defer fdsolv.Close()
|
||||
fdsolv, err := os.Open(path.Join(tftpDir, "..", "solver.sh"))
|
||||
if err != nil {
|
||||
log.Println("Unable to open solver.sh:", err.Error())
|
||||
} else {
|
||||
defer fdsolv.Close()
|
||||
|
||||
hdr := &cpio.Header{
|
||||
Name: "usr/share/doc/testdisk/solver.sh",
|
||||
Mode: 0111,
|
||||
ModTime: time.Now(),
|
||||
Size: st.Size(),
|
||||
}
|
||||
if err := wcpio.WriteHeader(hdr); err != nil {
|
||||
log.Println("Error when writing cpio header from", r.RemoteAddr, err.Error())
|
||||
http.Error(w, "Unable to treat your passwd file, please try again later", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
hdr, err := cpio.FileInfoHeader(fi, "")
|
||||
if err != nil {
|
||||
log.Println("Error when creating resolver header from", r.RemoteAddr, err.Error())
|
||||
} else {
|
||||
hdr.Name = "usr/share/doc/testdisk/solver.sh"
|
||||
hdr.Mode = 0111
|
||||
if err := wcpio.WriteHeader(hdr); err != nil {
|
||||
log.Println("Error when writing cpio header from", r.RemoteAddr, err.Error())
|
||||
http.Error(w, "Unable to treat your passwd file, please try again later", http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
_, err = io.Copy(wcpio, fdsolv)
|
||||
b, err := io.Copy(wcpio, fdsolv)
|
||||
if err != nil {
|
||||
log.Println("Error when copying resolver from", r.RemoteAddr, err.Error())
|
||||
} else {
|
||||
log.Println("solver:", b, "bytes copied to", r.RemoteAddr, "initrd")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user