go/msteinert-go-pam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

transaction: Define C functions as unexported static inlines

Browse Source 
This will make it easier to avoid exporting unexpected symbols to the
generated PAM libraries.

Also it makes less messy handling C code inside go files.
This commit is contained in:
Marco Trevisan (Treviño)
2023-11-20 21:06:58 +01:00
parent a8c4a14150
commit 4b39bd8e11
2 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
transaction.go
View File

@@ -4,21 +4,7 @@ package pam
//#cgo CFLAGS: -Wall -std=c99 //#cgo CFLAGS: -Wall -std=c99
//#cgo LDFLAGS: -lpam //#cgo LDFLAGS: -lpam
// //
//#include <security/pam_appl.h> //#include "transaction.h"
//#include <stdlib.h>
//#include <stdint.h>
//
//#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
//
//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 check_pam_start_confdir(void);
import "C" import "C"
import ( import (
@@ -89,16 +75,24 @@ func (f ConversationFunc) RespondPAM(s Style, msg string) (string, error) {
return f(s, msg) return f(s, msg)
} }
// cbPAMConv is a wrapper for the conversation callback function. // _go_pam_conv_handler is a C wrapper for the conversation callback function.
// //
//export cbPAMConv //export _go_pam_conv_handler
func cbPAMConv(s C.int, msg *C.char, c C.uintptr_t) (*C.char, C.int) { func _go_pam_conv_handler(msg *C.struct_pam_message, c C.uintptr_t, outMsg **C.char) C.int {
convHandler, ok := cgo.Handle(c).Value().(ConversationHandler)
if !ok || convHandler == nil {
return C.int(ErrConv)
}
replyMsg, r := pamConvHandler(Style(msg.msg_style), msg.msg, convHandler)
*outMsg = replyMsg
return r
}
// pamConvHandler is a Go wrapper for the conversation callback function.
func pamConvHandler(style Style, msg *C.char, handler ConversationHandler) (*C.char, C.int) {
var r string var r string
var err error var err error
v := cgo.Handle(c).Value() switch cb := handler.(type) {
style := Style(s)
var handler ConversationHandler
switch cb := v.(type) {
case BinaryConversationHandler: case BinaryConversationHandler:
if style == BinaryPrompt { if style == BinaryPrompt {
bytes, err := cb.RespondPAMBinary(BinaryPointer(msg)) bytes, err := cb.RespondPAMBinary(BinaryPointer(msg))
@@ -116,8 +110,7 @@ func cbPAMConv(s C.int, msg *C.char, c C.uintptr_t) (*C.char, C.int) {
return nil, C.int(ErrConv) return nil, C.int(ErrConv)
} }
handler = cb handler = cb
} default:
if handler == nil {
return nil, C.int(ErrConv) return nil, C.int(ErrConv)
} }
r, err = handler.RespondPAM(style, C.GoString(msg)) r, err = handler.RespondPAM(style, C.GoString(msg))

24
transaction.c → transaction.h
View File

@@ -1,15 +1,25 @@
#include "_cgo_export.h"
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <stdint.h> #include <stdint.h>
#include <stdlib.h>
#include <string.h> #include <string.h>
#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
#ifdef __sun #ifdef __sun
#define PAM_CONST #define PAM_CONST
#else #else
#define PAM_CONST const #define PAM_CONST const
#endif #endif
int cb_pam_conv(int num_msg, PAM_CONST struct pam_message **msg, struct pam_response **resp, void *appdata_ptr) extern int _go_pam_conv_handler(struct pam_message *, uintptr_t, char **reply);
static inline int cb_pam_conv(int num_msg, PAM_CONST struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
{ {
if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG) if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG)
return PAM_CONV_ERR; return PAM_CONV_ERR;
@@ -19,11 +29,9 @@ int cb_pam_conv(int num_msg, PAM_CONST struct pam_message **msg, struct pam_resp
return PAM_BUF_ERR; return PAM_BUF_ERR;
for (size_t i = 0; i < num_msg; ++i) { for (size_t i = 0; i < num_msg; ++i) {
struct cbPAMConv_return result = cbPAMConv(msg[i]->msg_style, (char *)msg[i]->msg, (uintptr_t)appdata_ptr); int result = _go_pam_conv_handler((struct pam_message *)msg[i], (uintptr_t)appdata_ptr, &(*resp)[i].resp);
if (result.r1 != PAM_SUCCESS) if (result != PAM_SUCCESS)
goto error; goto error;
(*resp)[i].resp = result.r0;
} }
return PAM_SUCCESS; return PAM_SUCCESS;
@@ -41,7 +49,7 @@ error:
return PAM_CONV_ERR; return PAM_CONV_ERR;
} }
void init_pam_conv(struct pam_conv *conv, uintptr_t appdata) static inline void init_pam_conv(struct pam_conv *conv, uintptr_t appdata)
{ {
conv->conv = cb_pam_conv; conv->conv = cb_pam_conv;
conv->appdata_ptr = (void *)appdata; conv->appdata_ptr = (void *)appdata;
@@ -52,7 +60,7 @@ void init_pam_conv(struct pam_conv *conv, uintptr_t appdata)
int pam_start_confdir(const char *service_name, const char *user, const struct pam_conv *pam_conversation, 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)); const char *confdir, pam_handle_t **pamh) __attribute__((weak));
int check_pam_start_confdir(void) static inline int check_pam_start_confdir(void)
{ {
if (pam_start_confdir == NULL) if (pam_start_confdir == NULL)
return 1; return 1;