forked from Deuxfleurs/bottin
Fix password comparison
This commit is contained in:
parent
2f9ad411c7
commit
c3bfcdf9a1
3 changed files with 6 additions and 5 deletions
|
@ -12,7 +12,7 @@ job "directory" {
|
|||
task "server" {
|
||||
driver = "docker"
|
||||
config {
|
||||
image = "lxpz/bottin_amd64:1"
|
||||
image = "lxpz/bottin_amd64:3"
|
||||
readonly_rootfs = true
|
||||
port_map {
|
||||
ldap_port = 389
|
||||
|
|
2
main.go
2
main.go
|
@ -5,6 +5,7 @@ package main
|
|||
// @FIXME: Add an initial prefix to the consul key value
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"crypto/tls"
|
||||
"encoding/base64"
|
||||
"encoding/json"
|
||||
|
@ -12,7 +13,6 @@ import (
|
|||
"fmt"
|
||||
"io/ioutil"
|
||||
"log"
|
||||
"crypto/rand"
|
||||
"os"
|
||||
"os/signal"
|
||||
"syscall"
|
||||
|
|
7
ssha.go
7
ssha.go
|
@ -1,12 +1,13 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
"log"
|
||||
"bytes"
|
||||
"crypto/rand"
|
||||
"crypto/sha1"
|
||||
"encoding/base64"
|
||||
"fmt"
|
||||
"crypto/rand"
|
||||
"log"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// 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
|
||||
func SSHAMatches(encodedPassPhrase string, rawPassPhrase []byte) bool {
|
||||
if encodedPassPhrase[:6] != "{ssha}" {
|
||||
if !strings.EqualFold(encodedPassPhrase[:6], "{ssha}") {
|
||||
return false
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue