Mirror
/
resh
mirror of https://github.com/curusarn/resh
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename variables to fit golang guidelines

Browse Source
pull/15/head
Simon Let 6 years ago
parent 22a0bf3f5e
commit ff763252f5
4 changed files with 41 additions and 41 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      collect/resh-collect.go
  2. 36
      common/resh-common.go
  3. 4
      evaluate/resh-evaluate.go
  4. 2
      sanitize-history/resh-sanitize-history.go

40
collect/resh-collect.go
Unescape View File

@ -30,9 +30,9 @@ func main() {
usr, _ := user.Current()
dir := usr.HomeDir
configPath := filepath.Join(dir, "/.config/resh.toml")
reshUuidPath := filepath.Join(dir, "/.resh/resh-uuid")
reshUUIDPath := filepath.Join(dir, "/.resh/resh-uuid")
machineIdPath := "/etc/machine-id"
machineIDPath := "/etc/machine-id"
var config common.Config
if _, err := toml.DecodeFile(configPath, &config); err != nil {
@ -48,7 +48,7 @@ func main() {
exitCode := flag.Int("exitCode", -1, "exit code")
shell := flag.String("shell", "", "actual shell")
uname := flag.String("uname", "", "uname")
sessionId := flag.String("sessionId", "", "resh generated session id")
sessionID := flag.String("sessionId", "", "resh generated session id")
// posix variables
cols := flag.String("cols", "-1", "$COLUMNS")
@ -82,10 +82,10 @@ func main() {
timezoneBefore := flag.String("timezoneBefore", "", "")
timezoneAfter := flag.String("timezoneAfter", "", "")
osReleaseId := flag.String("osReleaseId", "", "/etc/os-release ID")
osReleaseVersionId := flag.String("osReleaseVersionId", "",
osReleaseID := flag.String("osReleaseId", "", "/etc/os-release ID")
osReleaseVersionID := flag.String("osReleaseVersionId", "",
"/etc/os-release ID")
osReleaseIdLike := flag.String("osReleaseIdLike", "", "/etc/os-release ID")
osReleaseIDLike := flag.String("osReleaseIdLike", "", "/etc/os-release ID")
osReleaseName := flag.String("osReleaseName", "", "/etc/os-release ID")
osReleasePrettyName := flag.String("osReleasePrettyName", "",
"/etc/os-release ID")
@ -161,8 +161,8 @@ func main() {
*gitRemote = ""
}
if *osReleaseId == "" {
*osReleaseId = "linux"
if *osReleaseID == "" {
*osReleaseID = "linux"
}
if *osReleaseName == "" {
*osReleaseName = "Linux"
@ -177,7 +177,7 @@ func main() {
ExitCode: *exitCode,
Shell: *shell,
Uname: *uname,
SessionId: *sessionId,
SessionID: *sessionID,
// posix
Cols: *cols,
@ -220,15 +220,15 @@ func main() {
GitDir: gitDir,
GitRealDir: gitRealDir,
GitOriginRemote: *gitRemote,
MachineId: readFileContent(machineIdPath),
MachineID: readFileContent(machineIDPath),
OsReleaseId: *osReleaseId,
OsReleaseVersionId: *osReleaseVersionId,
OsReleaseIdLike: *osReleaseIdLike,
OsReleaseID: *osReleaseID,
OsReleaseVersionID: *osReleaseVersionID,
OsReleaseIDLike: *osReleaseIDLike,
OsReleaseName: *osReleaseName,
OsReleasePrettyName: *osReleasePrettyName,
ReshUuid: readFileContent(reshUuidPath),
ReshUUID: readFileContent(reshUUIDPath),
ReshVersion: Version,
ReshRevision: Revision,
}
@ -236,13 +236,13 @@ func main() {
}
func sendRecord(r common.Record, port string) {
recJson, err := json.Marshal(r)
recJSON, err := json.Marshal(r)
if err != nil {
log.Fatal("send err 1", err)
}
req, err := http.NewRequest("POST", "http://localhost:"+port+"/record",
bytes.NewBuffer(recJson))
bytes.NewBuffer(recJSON))
if err != nil {
log.Fatal("send err 2", err)
}
@ -279,14 +279,14 @@ func getGitDirs(cdup string, exitCode int, pwd string) (string, string) {
func getTimezoneOffsetInSeconds(zone string) float64 {
// date +%z -> "+0200"
hours_str := zone[:3]
mins_str := zone[3:]
hours, err := strconv.Atoi(hours_str)
hoursStr := zone[:3]
minsStr := zone[3:]
hours, err := strconv.Atoi(hoursStr)
if err != nil {
log.Println("err while parsing hours in timezone offset:", err)
return -1
}
mins, err := strconv.Atoi(mins_str)
mins, err := strconv.Atoi(minsStr)
if err != nil {
log.Println("err while parsing mins in timezone offset:", err)
return -1

36
common/resh-common.go
Unescape View File

@ -14,7 +14,7 @@ type Record struct {
ExitCode int `json:"exitCode"`
Shell string `json:"shell"`
Uname string `json:"uname"`
SessionId string `json:"sessionId"`
SessionID string `json:"sessionId"`
// posix
Cols string `json:"cols"`
@ -57,15 +57,15 @@ type Record struct {
GitDir string `json:"gitDir"`
GitRealDir string `json:"gitRealDir"`
GitOriginRemote string `json:"gitOriginRemote"`
MachineId string `json:"machineId"`
MachineID string `json:"machineId"`
OsReleaseId string `json:"osReleaseId"`
OsReleaseVersionId string `json:"osReleaseVersionId"`
OsReleaseIdLike string `json:"osReleaseIdLike"`
OsReleaseID string `json:"osReleaseId"`
OsReleaseVersionID string `json:"osReleaseVersionId"`
OsReleaseIDLike string `json:"osReleaseIdLike"`
OsReleaseName string `json:"osReleaseName"`
OsReleasePrettyName string `json:"osReleasePrettyName"`
ReshUuid string `json:"reshUuid"`
ReshUUID string `json:"reshUuid"`
ReshVersion string `json:"reshVersion"`
ReshRevision string `json:"reshRevision"`
@ -88,7 +88,7 @@ type FallbackRecord struct {
ExitCode int `json:"exitCode"`
Shell string `json:"shell"`
Uname string `json:"uname"`
SessionId string `json:"sessionId"`
SessionID string `json:"sessionId"`
// posix
Cols int `json:"cols"` // notice the in type
@ -131,15 +131,15 @@ type FallbackRecord struct {
GitDir string `json:"gitDir"`
GitRealDir string `json:"gitRealDir"`
GitOriginRemote string `json:"gitOriginRemote"`
MachineId string `json:"machineId"`
MachineID string `json:"machineId"`
OsReleaseId string `json:"osReleaseId"`
OsReleaseVersionId string `json:"osReleaseVersionId"`
OsReleaseIdLike string `json:"osReleaseIdLike"`
OsReleaseID string `json:"osReleaseId"`
OsReleaseVersionID string `json:"osReleaseVersionId"`
OsReleaseIDLike string `json:"osReleaseIdLike"`
OsReleaseName string `json:"osReleaseName"`
OsReleasePrettyName string `json:"osReleasePrettyName"`
ReshUuid string `json:"reshUuid"`
ReshUUID string `json:"reshUuid"`
ReshVersion string `json:"reshVersion"`
ReshRevision string `json:"reshRevision"`
}
@ -152,7 +152,7 @@ func ConvertRecord(r *FallbackRecord) Record {
ExitCode: r.ExitCode,
Shell: r.Shell,
Uname: r.Uname,
SessionId: r.SessionId,
SessionID: r.SessionID,
// posix
// these two lines are the only reason we are doing this
@ -196,15 +196,15 @@ func ConvertRecord(r *FallbackRecord) Record {
GitDir: r.GitDir,
GitRealDir: r.GitRealDir,
GitOriginRemote: r.GitOriginRemote,
MachineId: r.MachineId,
MachineID: r.MachineID,
OsReleaseId: r.OsReleaseId,
OsReleaseVersionId: r.OsReleaseVersionId,
OsReleaseIdLike: r.OsReleaseIdLike,
OsReleaseID: r.OsReleaseID,
OsReleaseVersionID: r.OsReleaseVersionID,
OsReleaseIDLike: r.OsReleaseIDLike,
OsReleaseName: r.OsReleaseName,
OsReleasePrettyName: r.OsReleasePrettyName,
ReshUuid: r.ReshUuid,
ReshUUID: r.ReshUUID,
ReshVersion: r.ReshVersion,
ReshRevision: r.ReshRevision,
}

4
evaluate/resh-evaluate.go
Unescape View File

@ -186,10 +186,10 @@ func (e *evaluator) processRecords() {
var nextID uint64
nextID = 0
for k, record := range e.UsersRecords[i].Devices[j].Records {
id, found := sessionIDs[record.SessionId]
id, found := sessionIDs[record.SessionID]
if found == false {
id = nextID
sessionIDs[record.SessionId] = id
sessionIDs[record.SessionID] = id
nextID++
}
record.SeqSessionID = id

2
sanitize-history/resh-sanitize-history.go
Unescape View File

@ -153,7 +153,7 @@ func (s *sanitizer) sanitizeRecord(record *common.Record) error {
// hash the most sensitive info, do not tokenize
record.Host = s.hashToken(record.Host)
record.Login = s.hashToken(record.Login)
record.MachineId = s.hashToken(record.MachineId)
record.MachineID = s.hashToken(record.MachineID)
var err error
// this changes git url a bit but I'm still happy with the result

Write Preview
Loading…
Cancel
Save