This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
-
-static fstring password;
-static fstring username;
-static int max_protocol = PROTOCOL_NT1;
-static BOOL showall = False;
-static BOOL old_list = False;
+#include "system/filesys.h"
+#include "system/dir.h"
+#include "libcli/libcli.h"
+#include "libcli/raw/libcliraw.h"
+#include "system/time.h"
+#include "pstring.h"
+#include "auth/credentials/credentials.h"
+#include "auth/gensec/gensec.h"
+#include "param/param.h"
+#include "dynconfig.h"
+
+#define MAX_STRING_LEN 1024
+
+static struct cli_credentials *credentials;
+static bool showall = false;
+static bool old_list = false;
static const char *maskchars = "<>\"?*abc.";
static const char *filechars = "abcdefghijklm.";
static int verbose;
static int die_on_error;
static int NumLoops = 0;
+static int max_length = 20;
-/* a test fn for LANMAN mask support */
-static int ms_fnmatch_lanman_core(const char *pattern, const char *string)
-{
- const char *p = pattern, *n = string;
- char c;
-
- if (strcmp(p,"?")==0 && strcmp(n,".")==0) goto match;
-
- while ((c = *p++)) {
- switch (c) {
- case '.':
- /* if (! *n && ! *p) goto match; */
- if (*n != '.') goto nomatch;
- n++;
- break;
-
- case '?':
- if ((*n == '.' && n[1] != '.') || ! *n) goto next;
- n++;
- break;
-
- case '>':
- if (n[0] == '.') {
- if (! n[1] && ms_fnmatch_lanman_core(p, n+1) == 0) goto match;
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- goto nomatch;
- }
- if (! *n) goto next;
- n++;
- break;
-
- case '*':
- if (! *p) goto match;
- for (; *n; n++) {
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- }
- break;
-
- case '<':
- for (; *n; n++) {
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- if (*n == '.' && !strchr_m(n+1,'.')) {
- n++;
- break;
- }
- }
- break;
-
- case '"':
- if (*n == 0 && ms_fnmatch_lanman_core(p, n) == 0) goto match;
- if (*n != '.') goto nomatch;
- n++;
- break;
-
- default:
- if (c != *n) goto nomatch;
- n++;
- }
- }
-
- if (! *n) goto match;
-
- nomatch:
- if (verbose) printf("NOMATCH pattern=[%s] string=[%s]\n", pattern, string);
- return -1;
-
-next:
- if (ms_fnmatch_lanman_core(p, n) == 0) goto match;
- goto nomatch;
-
- match:
- if (verbose) printf("MATCH pattern=[%s] string=[%s]\n", pattern, string);
- return 0;
-}
-
-static int ms_fnmatch_lanman(const char *pattern, const char *string)
-{
- if (!strpbrk(pattern, "?*<>\"")) {
- if (strcmp(string,"..") == 0)
- string = ".";
-
- return strcmp(pattern, string);
- }
-
- if (strcmp(string,"..") == 0 || strcmp(string,".") == 0) {
- return ms_fnmatch_lanman_core(pattern, "..") &&
- ms_fnmatch_lanman_core(pattern, ".");
- }
-
- return ms_fnmatch_lanman_core(pattern, string);
-}
-
-static BOOL reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
+static bool reg_match_one(struct smbcli_state *cli, const char *pattern, const char *file)
{
/* oh what a weird world this is */
- if (old_list && strcmp(pattern, "*.*") == 0) return True;
+ if (old_list && strcmp(pattern, "*.*") == 0) return true;
- if (strcmp(pattern,".") == 0) return False;
+ if (ISDOT(pattern)) return false;
- if (max_protocol <= PROTOCOL_LANMAN2) {
- return ms_fnmatch_lanman(pattern, file)==0;
- }
-
- if (strcmp(file,"..") == 0) file = ".";
+ if (ISDOTDOT(file)) file = ".";
return ms_fnmatch(pattern, file, cli->transport->negotiate.protocol)==0;
}
/*****************************************************
return a connection to a server
*******************************************************/
-static struct smbcli_state *connect_one(char *share)
+static struct smbcli_state *connect_one(char *share, const char **ports)
{
struct smbcli_state *c;
fstring server;
- uint_t flags = 0;
NTSTATUS status;
fstrcpy(server,share+2);
*share = 0;
share++;
- status = smbcli_full_connection(&c, "masktest",
- server, NULL,
- share, "?????",
- username, lp_workgroup(),
- password, flags, NULL);
+ cli_credentials_set_workstation(credentials, "masktest", CRED_SPECIFIED);
+
+ status = smbcli_full_connection(NULL, &c,
+ server,
+ ports,
+ share, NULL,
+ credentials, NULL);
if (!NT_STATUS_IS_OK(status)) {
return NULL;
static char *resultp;
static struct {
- pstring long_name;
- pstring short_name;
+ char *long_name;
+ char *short_name;
} last_hit;
-static BOOL f_info_hit;
+static bool f_info_hit;
-static void listfn(file_info *f, const char *s, void *state)
+static void listfn(struct clilist_file_info *f, const char *s, void *state)
{
- if (strcmp(f->name,".") == 0) {
+ if (ISDOT(f->name)) {
resultp[0] = '+';
- } else if (strcmp(f->name,"..") == 0) {
- resultp[1] = '+';
+ } else if (ISDOTDOT(f->name)) {
+ resultp[1] = '+';
} else {
resultp[2] = '+';
}
- pstrcpy(last_hit.long_name, f->name);
- pstrcpy(last_hit.short_name, f->short_name);
- f_info_hit = True;
+ safe_strcpy(last_hit.long_name, f->name, MAX_STRING_LEN);
+ safe_strcpy(last_hit.short_name, f->short_name, MAX_STRING_LEN);
+ f_info_hit = true;
}
-static void get_real_name(struct smbcli_state *cli,
- pstring long_name, fstring short_name)
+static void get_real_name(TALLOC_CTX *mem_ctx, struct smbcli_state *cli,
+ char *long_name, fstring short_name)
{
const char *mask;
- if (max_protocol <= PROTOCOL_LANMAN1) {
+ if (cli->transport->negotiate.protocol <= PROTOCOL_LANMAN1) {
mask = "\\masktest\\*.*";
} else {
mask = "\\masktest\\*";
}
- f_info_hit = False;
+ f_info_hit = false;
+ last_hit.short_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+ last_hit.long_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
- smbcli_list_new(cli->tree, mask,
- FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
- listfn, NULL);
+ smbcli_list_new(cli->tree, mask,
+ FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+ RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
+ listfn, NULL);
if (f_info_hit) {
fstrcpy(short_name, last_hit.short_name);
strlower(short_name);
- pstrcpy(long_name, last_hit.long_name);
+ safe_strcpy(long_name, last_hit.long_name, MAX_STRING_LEN);
strlower(long_name);
}
}
}
-static void testpair(struct smbcli_state *cli, char *mask, char *file)
+static void testpair(TALLOC_CTX *mem_ctx, struct smbcli_state *cli, char *mask,
+ char *file)
{
int fnum;
fstring res1;
char *res2;
static int count;
fstring short_name;
- pstring long_name;
+ char *long_name;
+ long_name = talloc_array(mem_ctx, char, MAX_STRING_LEN);
count++;
fstrcpy(res1, "---");
resultp = res1;
fstrcpy(short_name, "");
- get_real_name(cli, long_name, short_name);
+ get_real_name(mem_ctx, cli, long_name, short_name);
fstrcpy(res1, "---");
- smbcli_list(cli->tree, mask,
- FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
- listfn, NULL);
+ smbcli_list_new(cli->tree, mask,
+ FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_DIRECTORY,
+ RAW_SEARCH_DATA_BOTH_DIRECTORY_INFO,
+ listfn, NULL);
res2 = reg_test(cli, mask, long_name, short_name);
smbcli_unlink(cli->tree, file);
if (count % 100 == 0) DEBUG(0,("%d\n", count));
+
+ resultp = NULL;
}
-static void test_mask(int argc, char *argv[],
+static void test_mask(int argc, char *argv[],
struct smbcli_state *cli)
{
- pstring mask, file;
+ TALLOC_CTX *mem_ctx;
+ char *mask, *file;
int l1, l2, i, l;
int mc_len = strlen(maskchars);
int fc_len = strlen(filechars);
+ mem_ctx = talloc_init("test_mask");
+ mask = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+ file = talloc_array(mem_ctx, char, MAX_STRING_LEN);
+
smbcli_mkdir(cli->tree, "\\masktest");
smbcli_unlink(cli->tree, "\\masktest\\*");
if (argc >= 2) {
while (argc >= 2) {
- pstrcpy(mask,"\\masktest\\");
- pstrcpy(file,"\\masktest\\");
- pstrcat(mask, argv[0]);
- pstrcat(file, argv[1]);
- testpair(cli, mask, file);
+ safe_strcpy(mask,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcpy(file,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcat(mask, argv[0], MAX_STRING_LEN);
+ safe_strcat(file, argv[1], MAX_STRING_LEN);
+ testpair(mem_ctx, cli, mask, file);
argv += 2;
argc -= 2;
}
}
while (1) {
- l1 = 1 + random() % 20;
- l2 = 1 + random() % 20;
- pstrcpy(mask,"\\masktest\\");
- pstrcpy(file,"\\masktest\\");
+ l1 = 1 + random() % max_length;
+ l2 = 1 + random() % max_length;
+ safe_strcpy(mask,"\\masktest\\", MAX_STRING_LEN);
+ safe_strcpy(file,"\\masktest\\", MAX_STRING_LEN);
l = strlen(mask);
for (i=0;i<l1;i++) {
mask[i+l] = maskchars[random() % mc_len];
}
file[l+l2] = 0;
- if (strcmp(file+l,".") == 0 ||
- strcmp(file+l,"..") == 0 ||
- strcmp(mask+l,"..") == 0) continue;
+ if (ISDOT(file+l) || ISDOTDOT(file+l) || ISDOTDOT(mask+l)) {
+ continue;
+ }
if (strspn(file+l, ".") == strlen(file+l)) continue;
- testpair(cli, mask, file);
+ testpair(mem_ctx, cli, mask, file);
if (NumLoops && (--NumLoops == 0))
break;
}
finished:
smbcli_rmdir(cli->tree, "\\masktest");
+ talloc_free(mem_ctx);
}
-W workgroup\n\
-U user%%pass\n\
-s seed\n\
+ -l max test length\n\
-M max protocol\n\
-f filechars (default %s)\n\
-m maskchars (default %s)\n\
char *share;
struct smbcli_state *cli;
int opt;
- char *p;
int seed;
+ struct loadparm_context *lp_ctx;
setlinebuf(stdout);
setup_logging("masktest", DEBUG_STDOUT);
- lp_set_cmdline("log level", "0");
-
if (argc < 2 || argv[1][0] == '-') {
usage();
exit(1);
argc -= 1;
argv += 1;
- lp_load(dyn_CONFIGFILE,True,False,False);
- load_interfaces();
+ lp_ctx = loadparm_init(talloc_autofree_context());
+ lp_load(lp_ctx, dyn_CONFIGFILE);
- if (getenv("USER")) {
- fstrcpy(username,getenv("USER"));
- }
+ credentials = cli_credentials_init(talloc_autofree_context());
+ cli_credentials_guess(credentials, lp_ctx);
seed = time(NULL);
- while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vE")) != EOF) {
+ while ((opt = getopt(argc, argv, "n:d:U:s:hm:f:aoW:M:vEl:")) != EOF) {
switch (opt) {
case 'n':
NumLoops = atoi(optarg);
verbose++;
break;
case 'M':
- max_protocol = interpret_protocol(optarg, max_protocol);
+ lp_set_cmdline(lp_ctx, "max protocol", optarg);
break;
case 'U':
- fstrcpy(username,optarg);
- p = strchr_m(username,'%');
- if (p) {
- *p = 0;
- fstrcpy(password, p+1);
- }
+ cli_credentials_parse_string(credentials, optarg, CRED_SPECIFIED);
break;
case 's':
seed = atoi(optarg);
case 'm':
maskchars = optarg;
break;
+ case 'l':
+ max_length = atoi(optarg);
+ break;
case 'f':
filechars = optarg;
break;
showall = 1;
break;
case 'o':
- old_list = True;
+ old_list = true;
break;
default:
printf("Unknown option %c (%d)\n", (char)opt, opt);
}
}
+ gensec_init(lp_ctx);
+
argc -= optind;
argv += optind;
-
- cli = connect_one(share);
+ cli = connect_one(share, lp_smb_ports(lp_ctx));
if (!cli) {
DEBUG(0,("Failed to connect to %s\n", share));
exit(1);
}
/* need to init seed after connect as clientgen uses random numbers */
- DEBUG(0,("seed=%d\n", seed));
+ DEBUG(0,("seed=%d format --- --- (server, correct)\n", seed));
srandom(seed);
test_mask(argc, argv, cli);
git.samba.org / ira / wip.git / blobdiff