Deuxfleurs
/
bottin
23
4
Fork 2
Code Issues 7 Pull Requests 1 Releases Activity

Fix password comparison

This commit is contained in:
Alex 2020-02-01 11:32:50 +01:00
parent 2f9ad411c7
commit c3bfcdf9a1
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bottin.hcl.example
View File

@ -12,7 +12,7 @@ job "directory" {
task "server" { task "server" {
driver = "docker" driver = "docker"
config { config {
image = "lxpz/bottin_amd64:1" image = "lxpz/bottin_amd64:3"
readonly_rootfs = true readonly_rootfs = true
port_map { port_map {
ldap_port = 389 ldap_port = 389

2
main.go
View File

@ -5,6 +5,7 @@ package main
// @FIXME: Add an initial prefix to the consul key value // @FIXME: Add an initial prefix to the consul key value
import ( import (
"crypto/rand"
"crypto/tls" "crypto/tls"
"encoding/base64" "encoding/base64"
"encoding/json" "encoding/json"
@ -12,7 +13,6 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"log" "log"
"crypto/rand"
"os" "os"
"os/signal" "os/signal"
"syscall" "syscall"

7
ssha.go
View File

@ -1,12 +1,13 @@
package main package main
import ( import (
"log"
"bytes" "bytes"
"crypto/rand"
"crypto/sha1" "crypto/sha1"
"encoding/base64" "encoding/base64"
"fmt" "fmt"
"crypto/rand" "log"
"strings"
) )
// Encode encodes the []byte of raw password // Encode encodes the []byte of raw password
@ -18,7 +19,7 @@ func SSHAEncode(rawPassPhrase []byte) string {
// Matches matches the encoded password and the raw password // Matches matches the encoded password and the raw password
func SSHAMatches(encodedPassPhrase string, rawPassPhrase []byte) bool { func SSHAMatches(encodedPassPhrase string, rawPassPhrase []byte) bool {
if encodedPassPhrase[:6] != "{ssha}" { if !strings.EqualFold(encodedPassPhrase[:6], "{ssha}") {
return false return false
} }