transaction: Add support for Binary conversation
PAM Supports binary conversations using private protocols, this can be handled by C but it's not supported here because we implicitly convert all the messages to string, and this may lead to issues when this is not the case (as in binary protocol the pointer could contain zeros that the GoString conversion would consider them the end of the message). So, add another conversation handler implementation that allows to handle the binary protocol, whose function callback accepts a pointer to the struct (we can't use bytes as the length is unknown and may be defined in the header of the pointer itself). However since the binary prompt is not supported by all the platform we need to do a compile-time check to disable it in case is used when not supported.
This commit is contained in:
@@ -9,6 +9,14 @@ package pam
|
|||||||
//void init_pam_conv(struct pam_conv *conv, uintptr_t);
|
//void init_pam_conv(struct pam_conv *conv, uintptr_t);
|
||||||
//int pam_start_confdir(const char *service_name, const char *user, const struct pam_conv *pam_conversation, const char *confdir, pam_handle_t **pamh) __attribute__ ((weak));
|
//int pam_start_confdir(const char *service_name, const char *user, const struct pam_conv *pam_conversation, const char *confdir, pam_handle_t **pamh) __attribute__ ((weak));
|
||||||
//int check_pam_start_confdir(void);
|
//int check_pam_start_confdir(void);
|
||||||
|
//
|
||||||
|
//#ifdef PAM_BINARY_PROMPT
|
||||||
|
//#define BINARY_PROMPT_IS_SUPPORTED 1
|
||||||
|
//#else
|
||||||
|
//#include <limits.h>
|
||||||
|
//#define PAM_BINARY_PROMPT INT_MAX
|
||||||
|
//#define BINARY_PROMPT_IS_SUPPORTED 0
|
||||||
|
//#endif
|
||||||
import "C"
|
import "C"
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@@ -47,6 +55,20 @@ type ConversationHandler interface {
|
|||||||
RespondPAM(Style, string) (string, error)
|
RespondPAM(Style, string) (string, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// BinaryPointer exposes the type used for the data in a binary conversation
|
||||||
|
// it represents a pointer to data that is produced by the module and that
|
||||||
|
// must be parsed depending on the protocol in use
|
||||||
|
type BinaryPointer unsafe.Pointer
|
||||||
|
|
||||||
|
type BinaryConversationHandler interface {
|
||||||
|
ConversationHandler
|
||||||
|
// Respond receives a pointer to the binary message. It's up to the
|
||||||
|
// receiver to parse it according to the protocol specifications.
|
||||||
|
// The function can return a byte array that will passed as pointer back
|
||||||
|
// to the module.
|
||||||
|
RespondPAMBinary(BinaryPointer) ([]byte, error)
|
||||||
|
}
|
||||||
|
|
||||||
// ConversationFunc is an adapter to allow the use of ordinary functions as
|
// ConversationFunc is an adapter to allow the use of ordinary functions as
|
||||||
// conversation callbacks.
|
// conversation callbacks.
|
||||||
type ConversationFunc func(Style, string) (string, error)
|
type ConversationFunc func(Style, string) (string, error)
|
||||||
@@ -64,7 +86,20 @@ func cbPAMConv(s C.int, msg *C.char, c C.uintptr_t) (*C.char, C.int) {
|
|||||||
v := cgo.Handle(c).Value()
|
v := cgo.Handle(c).Value()
|
||||||
switch cb := v.(type) {
|
switch cb := v.(type) {
|
||||||
case ConversationHandler:
|
case ConversationHandler:
|
||||||
|
if s == C.PAM_BINARY_PROMPT {
|
||||||
|
return nil, C.PAM_AUTHINFO_UNAVAIL
|
||||||
|
}
|
||||||
r, err = cb.RespondPAM(Style(s), C.GoString(msg))
|
r, err = cb.RespondPAM(Style(s), C.GoString(msg))
|
||||||
|
case BinaryConversationHandler:
|
||||||
|
if s == C.PAM_BINARY_PROMPT {
|
||||||
|
bytes, err := cb.RespondPAMBinary(BinaryPointer(msg))
|
||||||
|
if err != nil {
|
||||||
|
return nil, C.PAM_CONV_ERR
|
||||||
|
}
|
||||||
|
return (*C.char)(C.CBytes(bytes)), C.PAM_SUCCESS
|
||||||
|
} else {
|
||||||
|
r, err = cb.RespondPAM(Style(s), C.GoString(msg))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, C.PAM_CONV_ERR
|
return nil, C.PAM_CONV_ERR
|
||||||
@@ -117,6 +152,12 @@ func StartConfDir(service, user string, handler ConversationHandler, confDir str
|
|||||||
}
|
}
|
||||||
|
|
||||||
func start(service, user string, handler ConversationHandler, confDir string) (*Transaction, error) {
|
func start(service, user string, handler ConversationHandler, confDir string) (*Transaction, error) {
|
||||||
|
switch handler.(type) {
|
||||||
|
case BinaryConversationHandler:
|
||||||
|
if C.BINARY_PROMPT_IS_SUPPORTED == 0 {
|
||||||
|
return nil, errors.New("BinaryConversationHandler() was used, but it is not supported by this platform")
|
||||||
|
}
|
||||||
|
}
|
||||||
t := &Transaction{
|
t := &Transaction{
|
||||||
conv: &C.struct_pam_conv{},
|
conv: &C.struct_pam_conv{},
|
||||||
c: cgo.NewHandle(handler),
|
c: cgo.NewHandle(handler),
|
||||||
|
|||||||
Reference in New Issue
Block a user