BEE Backport bacula/src/lib/protos.h

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu Feb 27 20:47:10 2020 +0100

    Add gdb_print_local() function to display local variables via gdb

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Feb 17 12:59:43 2020 +0100

    Move dedup functions in separted files

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Nov 29 11:07:36 2019 +0100

    Fix #5755 about segfault in bdirjson with very long strings to quote

Author: Henrique <henrique.faria@baculasystems.com>
Date:   Mon Nov 18 23:46:16 2019 -0300

    cdp: added 'group' Plugin Parameter

Author: Henrique <henrique.faria@baculasystems.com>
Date:   Wed Nov 13 02:23:37 2019 -0300

    cdp: added plugin param 'user' and fixed segfault on get_user_home_directory(...)

Author: Alain Spineux <alain@baculasystems.com>
Date:   Fri Aug 16 16:33:22 2019 +0200

    add new gdb_stack_trace() that call gdb to do a stack trace

    - need to call gdb twice, one to find the right thread from the thread
      systag

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Wed May 1 15:24:21 2019 +0200

    Accept |script in the Client Address directive

Author: Alain Spineux <alain@baculasystems.com>
Date:   Mon Apr 8 13:57:48 2019 +0200

    new scan_string() to be used where "old" bsscanf() don't work

Author: Alain Spineux <alain@baculasystems.com>
Date:   Mon Apr 8 17:42:28 2019 +0200

    PSK: modify bnet_tls_(client|server) to pass the shared key via the SSL*

    - instead of the CTX, because for SD <-> FD the auth_key is generated by
       the director

Author: Alain Spineux <alain@baculasystems.com>
Date:   Tue Mar 12 18:21:11 2019 +0100

    PSK: make Bacula's core files related to TLS and authentication ready

    - add PSK code to tls.c
    - modify cram_md5_respond() to support early "STARTLS"
      - the recv() must be done first to see if we get a starttls command
        or if we continue cram-md5the old way
    - skip TLS verification part when PSK is used

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Thu Sep 20 17:10:58 2018 +0200

    Add xattr_list_append() function to manipulate the listxattr() list

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Mon Jun 18 15:40:30 2018 +0200

    Allow glob type expression in Console ACL lists

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri May 12 17:32:04 2017 +0200

    Add bget_max_mlock() to limit the amount of memory that can be locked

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri May 12 15:58:42 2017 +0200

    Add bget_memory() function

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Wed Mar 23 10:05:32 2016 +0100

    Fix #1674 About Solaris Intel SD checksum errors

diff --git a/bacula/src/lib/priv.c b/bacula/src/lib/priv.c
index 70efead729c22fa15349b48a4be3569636be5265..1af80c72ce4eaf0b76555b3047286999d95651f5 100644 (file)
--- a/bacula/src/lib/priv.c
+++ b/bacula/src/lib/priv.c
@@ -127,3 +127,4 @@ void drop(char *uname, char *gname, bool keep_readall_caps)
    }
 #endif
 }
+

diff --git a/bacula/src/lib/protos.h b/bacula/src/lib/protos.h
index 1200452c2ef4f01ab39e65311308054d3ee61176..c25b03c686750bbdecd56f2cd356f5b50e4ef81a 100644 (file)
--- a/bacula/src/lib/protos.h
+++ b/bacula/src/lib/protos.h
@@ -67,18 +67,22 @@ bool display_global_item(HPKT &hpkt);
 void display_collector_types(HPKT &hpkt);
 
 /* bsys.c */
+int get_user_home_directory(const char *user, POOLMEM *&home);
+int get_home_directories(const char *grpname, alist *dirs);
 char *ucfirst(char *dest, const char *src, int len);
 typedef enum {
    WAIT_READ  = 1,
    WAIT_WRITE = 2
 } fd_wait_mode;
+uint64_t bget_os_memory();
+uint64_t bget_max_mlock(int64_t value);
 int fd_wait_data(int fd, fd_wait_mode mode, int sec, int msec);
 FILE *bfopen(const char *path, const char *mode);
 int baccept(int sockfd, struct sockaddr *addr, socklen_t *addrlen);
 int copyfile(const char *src, const char *dst);
 void setup_env(char *envp[]);
-POOLMEM  *quote_string           (POOLMEM *snew, const char *old);
-POOLMEM  *quote_where            (POOLMEM *snew, const char *old);
+POOLMEM  *quote_string           (POOLMEM *&snew, const char *old);
+POOLMEM  *quote_where            (POOLMEM *&snew, const char *old);
 char     *bstrncpy               (char *dest, const char *src, int maxlen);
 char     *bstrncpy               (char *dest, POOL_MEM &src, int maxlen);
 char     *bstrncat               (char *dest, const char *src, int maxlen);
@@ -116,14 +120,17 @@ char     *escape_filename(const char *file_path);
 int       Zdeflate(char *in, int in_len, char *out, int &out_len);
 int       Zinflate(char *in, int in_len, char *out, int &out_len);
 void      stack_trace();
+void      gdb_stack_trace();
+void      gdb_print_local(int level);
+
 int       safer_unlink(const char *pathname, const char *regex);
 int fs_get_free_space(const char *path, int64_t *freeval, int64_t *totalval);
 
 /* bnet.c */
 bool       bnet_tls_server       (TLS_CONTEXT *ctx, BSOCK *bsock,
-                                  alist *verify_list);
+                                  alist *verify_list, const char *psk_shard_key);
 bool       bnet_tls_client       (TLS_CONTEXT *ctx, BSOCK *bsock,
-                                  alist *verify_list);
+                                  alist *verify_list, const char *psk_shard_key);
 BSOCK *    init_bsock            (JCR *jcr, int sockfd, const char *who, const char *ip,
                                   int port, struct sockaddr *client_addr);
 #ifdef HAVE_WIN32
@@ -150,18 +157,27 @@ int              close_epipe(BPIPE *bpipe);
 int              close_bpipe(BPIPE *bpipe);
 
 /* cram-md5.c */
-bool cram_md5_respond(BSOCK *bs, const char *password, int *tls_remote_need, int *compatible);
+bool cram_md5_respond(BSOCK *bs, const char *password, int *tls_remote_need, int *compatible, bool use_bs_msg=false);
 bool cram_md5_challenge(BSOCK *bs, const char *password, int tls_local_need, int compatible);
 void hmac_md5(uint8_t* text, int text_len, uint8_t* key, int key_len, uint8_t *hmac);
 
 /* crc32.c */
 
 uint32_t bcrc32(unsigned char *buf, int len);
+uint32_t bcrc32_bad(unsigned char *buf, int len);
+
 
+/* openssl.c */
+const char *crypto_get_version();
 
 /* crypto.c */
-int                init_crypto                 (void);
+bool               crypto_check_digest(JCR *jcr, crypto_digest_t type);
+bool               crypto_get_fips();         /* true/false */
+const char        *crypto_get_fips_enabled(); /* yes/no */
+void               crypto_use_fips(bool fips);
+int                init_crypto                 ();
 int                cleanup_crypto              (void);
+int                crypto_check_fips(bool enabled);
 DIGEST *           crypto_digest_new           (JCR *jcr, crypto_digest_t type);
 bool               crypto_digest_update        (DIGEST *digest, const uint8_t *data, uint32_t length);
 bool               crypto_digest_finalize      (DIGEST *digest, uint8_t *dest, uint32_t *length);
@@ -214,7 +230,11 @@ char             *edit_utime             (utime_t val, char *buf, int buf_len);
 bool             is_a_number             (const char *num);
 bool             is_a_number_list        (const char *n);
 bool             is_an_integer           (const char *n);
+
+#define EXTRA_VALID_RESOURCE_CHAR ":.-_ "
+#define EXTRA_VALID_RESOURCE_CHAR_GLOB  EXTRA_VALID_RESOURCE_CHAR "[]*?"
 bool             is_name_valid           (const char *name, POOLMEM **msg);
+bool             is_name_valid           (const char *name, POOLMEM **msg, const char *accept);
 
 /* jcr.c (most definitions are in src/jcr.h) */
 void     init_last_jobs_list();
@@ -319,6 +339,7 @@ int              parse_args_only(POOLMEM *cmd, POOLMEM **args, int *argc,
 void            split_path_and_filename(const char *fname, POOLMEM **path,
                         int *pnl, POOLMEM **file, int *fnl);
 int             bsscanf(const char *buf, const char *fmt, ...);
+int             scan_string(const char *buf, const char *fmt, ...);
 
 
 /* tls.c */
@@ -331,6 +352,9 @@ TLS_CONTEXT      *new_tls_context        (const char *ca_certfile,
                                           const char *dhfile,
                                           bool verify_peer);
 void             free_tls_context        (TLS_CONTEXT *ctx);
+TLS_CONTEXT      *new_psk_context        (const char *shared_key);
+bool             psk_set_shared_key      (TLS_CONNECTION *tls, const char *shared_key);
+void             free_psk_context        (TLS_CONTEXT *ctx);
 #ifdef HAVE_TLS
 bool             tls_postconnect_verify_host(JCR *jcr, TLS_CONNECTION *tls,
                                                const char *host);
@@ -347,6 +371,7 @@ void             tls_bsock_shutdown      (BSOCKCORE *bsock);
 void             free_tls_connection     (TLS_CONNECTION *tls);
 bool             get_tls_require         (TLS_CONTEXT *ctx);
 bool             get_tls_enable          (TLS_CONTEXT *ctx);
+bool             get_tls_psk_context     (TLS_CONTEXT *ctx);
 
 
 /* util.c */
@@ -377,9 +402,12 @@ const char *     volume_status_to_str    (const char *status);
 void             make_session_key        (char *key, char *seed, int mode);
 void             encode_session_key      (char *encode, char *session, char *key, int maxlen);
 void             decode_session_key      (char *decode, char *session, char *key, int maxlen);
-POOLMEM *        edit_job_codes          (JCR *jcr, char *omsg, char *imsg, const char *to, job_code_callback_t job_code_callback = NULL);
+POOLMEM *        edit_job_codes          (JCR *jcr, POOLMEM *&omsg, char *imsg, const char *to, job_code_callback_t job_code_callback = NULL);
 void             set_working_directory   (char *wd);
 const char *     last_path_separator     (const char *str);
+int xattr_list_append(POOLMEM *&list, int len, const char *str, int str_len);
+bool is_offset_stream(int stream);
+
 
 /* watchdog.c */
 int start_watchdog(void);