summaryrefslogtreecommitdiff
path: root/source3
AgeCommit message (Collapse)AuthorFilesLines
2010-03-16smb_traffic_analyzer.c: optimize marshalling function and documentHolger Hetterich2-34/+54
Collect all data that is needed, and use only one talloc_asprintf operation to create the string of common data. This simplifies the code a bit and is most probably faster than the old method. Also, #define SMBTA_COMMON_DATA_COUNT as a complete string, speeding things up because we know the value at compile time.
2010-03-16vfs_smb_traffic_analyzer.c: added functionHolger Hetterich1-63/+58
static char *smb_traffic_analyzer_anonymize This takes a lot of code out of the main functions, and makes it a bit simpler. Do the anonymization in a function. Since we already anonymized the username we don't need to do this a second time in the v2 marshalling function.
2010-03-16Simplify the code a bit by creating the functions:Holger Hetterich1-84/+123
smb_traffic_analyzer_encrypt - doing the encryption of a data block, smb_traffic_analyzer_create_header - create the protocol header, smb_traffic_analyzer_write_data - actually write the data to the socket.
2010-03-16Add the number of common data blocks to the protocol.Holger Hetterich2-10/+33
Always send the number of common data blocks first. This way, we can make the protocol backwards compatible. A receiver running with an older subprotocol can just ignore if a newer sender sends more common data. Add a few remarks to the marshalling function. Add two #define lines defining the protocol subrelease number and the number of common data blocks to the header file.
2010-03-16Put all the protocol stuff into a separate header file.Holger Hetterich2-114/+152
All the structures and the vfs function identifier list is required by the receiver. It's therefore very handy to have this in an extra header file.
2010-03-16Add smbta-util to manage the encryption key.Holger Hetterich3-4/+225
This program allows the administrator to enable or disable AES encryption when using vfs_smb_traffic_analyzer. It also generates new keys, stores them to a file, so that the file can be reused on another client or server.
2010-03-16Implement AES encryption of the data block.Holger Hetterich1-13/+33
First try. This runs on 16 bytes long AES block size, and enlarges the data block with 16 bytes, to make sure all bytes are in. The added bytes are filled with '.'. It then creates a header featuring the new length to be send, and finally sends the data block, then returns. This code is untested, as creating the receiver will be my next step. To simplify traffic_analyzer's code, this code should run as a function. It's on the do-to-list.
2010-03-16Implement anonymization for protocol v2.Holger Hetterich1-14/+53
Since we need to care for the SID too, do the anonymization in the marshalling function and anonymize both the username and the SID. Remove the 'A' status flag from the header definition. A listener could see from the unencrypted header if the module is anonymizing or not, which is certainly not wanted.
2010-03-16Make all remarks compatible to the linux kernel coding styleguide.Holger Hetterich1-27/+33
2010-03-16Added an exact description of the V2 protocol.Holger Hetterich1-0/+62
I don't think it should have it's place the man page, because this is developer information.
2010-03-16Move the creation of the header.Holger Hetterich1-11/+37
Since the header block of the protocol contains the number of bytes to come, we always send the header itself unmodified. If we compress or crypt the data we are about to send, the length of the data to send may change. Therefore, we no longer create the header in smb_traffic_analyzer_create_string, but shortly before we send the data. For both cases, encryption and normal, we create our own header, and send it before the actual data. In case of protocol v1, we don't need to create an extra header. Just send the data, and return from the function. Change a debug message to say that the header for crypted data has been created. Add a status flags consisting of 6 bytes to the header. Their function will be descriped in one of the next patches, which is descriping the header in a longer comment. When anonymization and/or encryption is used, set the flags accordingly.
2010-03-16Fetch the SID of the user we are running as and send with the commonHolger Hetterich1-2/+5
data.
2010-03-16Additionally send the vfs function id with the protocol.Holger Hetterich1-7/+11
2010-03-16According to the linux kernel coding styleguide, it's better toHolger Hetterich1-46/+46
align the switch and it's case statements in the same column. This saves us one indentation level.
2010-03-16Don't use typedefs on the VFS function data structures asHolger Hetterich1-27/+27
typedefs are evil according to the linux kernel coding styleguide.
2010-03-16Add read,pread,write,pwrite support to the V2 protocol.Holger Hetterich1-3/+14
2010-03-16Enable AES encryption of the data if a key was found in secrets.tdb.Holger Hetterich1-3/+22
2010-03-16Add rmdir, chdir, and rename as supported VFS functionsHolger Hetterich1-9/+87
2010-03-16The format of data we are sending over the network will be flexible when ↵Holger Hetterich1-4/+74
sending over the network in protocol v2. To be able to do this, we create a new va-list function that is creating the buffer to send. Also it makes it easier for the receiver to parse the data; it sends an initial header containing the full length of the buffer to be send. For the individual strings, it sends sub headers containing the length of the upcoming substring to be send. With the header-data-header-data [..] structure we don't need to quote the sub strings finally enabling having all possible character sets in filenames etc.. In the sending function, implement mkdir to actually send it's data for testing.
2010-03-16Create structs carrying the data of individual VFS functions, and hand those ↵Holger Hetterich1-33/+47
over to the send function, which then casts the void pointer to the struct required by looking at the id. This allows us to return different result data depending on the VFS function that is running. Make the protocol v1 sender compatible to this. Adapt the existing VFS functions to use the new data structures. Make use of the new functionality and extend the mkdir VFS logger function to return the creation mode additionally.
2010-03-16Introduce smb_traffic_analyzer protocol v2.Holger Hetterich1-7/+62
From Holger: Make smb_traffic_analyzer differ the protocol versions to enable the development of version 2 of the protocol. To do this, a new parameter "protocol_version" has been introduced, which can be set to "V1", "V2", or nothing. If protocol_version is not set, V1 will be chosen automatically. Created an enum for identifying VFS functions in the upcoming protocol v2. Converted the existing VFS functions to use the identifier, and set the read/write bool used in protocol v1 accordingly, also ignore any other VFS functions except read/write/pread/pwrite in v1. Added a first new VFS function for mkdir, which I use for testing and implementing both the sender and receiver for v2.
2010-03-15Fix bug #7191 - WINS doesn't respond after > 86 #1c registrations.Craig Miskell1-4/+115
2010-03-16s3:registry-legacy: use talloc_stackframe() instead of NULL in ↵Michael Adam1-2/+3
regkey_open_internal() Michael
2010-03-16s3:smbcacls: also honour the "--sddl" flag when setting ACLs.Michael Adam1-2/+6
Michael
2010-03-15s3: Fix an uninitialized variable readVolker Lendecke1-1/+1
Found by Laurent Gaffie <laurent.gaffie@gmail.com> Thanks for that, Volker
2010-03-15Remove the bool admin_user from conn struct. We no longer look at this to ↵Jeremy Allison4-9/+5
make access decisions. Jeremy.
2010-03-15Fix bug #7188 - Logic error in check of total_data for call_trans2mkdir()Jeremy Allison1-16/+13
Make ea data checks identical for trans2open and trans2mkdir. Jeremy.
2010-03-15Remove reference to conn->admin_user in preparation for removal.Jeremy Allison1-9/+13
We use (uid_t)0 here not sec_initial_uid() as make test uses a single user context. I will revisit this when all the uid check changes are complete. Jeremy.
2010-03-15Simplify processing of "admin user". If a user is an admin_user ensure their ↵Jeremy Allison1-15/+14
conn token is uid 0. This simplifies change_to_user() and removes special processing of the assignments we pass to set_sec_ctx(). Jeremy.
2010-03-15Switch over to using get_currect_XXX() accessor functions.Jeremy Allison5-33/+38
Jeremy.
2010-03-15Pass "connection_struct *conn" into functions that currently use ↵Jeremy Allison3-20/+22
"current_user.XXX" Will allow me to replace them with accessor functions. Jeremy.
2010-03-15Add accessor functions for current uid, gid, unix token, NT token and vuid.Jeremy Allison2-0/+48
Jeremy.
2010-03-15We don't need to treat the token differently in the conn->admin_user case, ↵Jeremy Allison1-11/+0
it should already be pointing to a token with uid == 0. Jeremy.
2010-03-15Rever e80ceb1d7355c8c46a2ed90d5721cf367640f4e8 "Remove more uses of "extern ↵Jeremy Allison10-129/+78
struct current_user current_user;"." As requested by Volker, split this into smaller commits. Jeremy.
2010-03-15s3:smbd: make sure we always have a valid talloc stackframeStefan Metzmacher1-0/+3
metze
2010-03-15s3-spoolss: Fix _spoolss_EnumPrinterData.Günther Deschner1-3/+5
Guenther
2010-03-14s3: Remove some unused #definesVolker Lendecke1-8/+0
2010-03-14s3: Use a switch to implement map_nt_error_from_tdbVolker Lendecke1-30/+47
First, this immediately gave me the warning that TDB_ERR_NESTING was not covered and second, this saved 48 bytes in the .o :-)
2010-03-14s3: Remove some unused codeVolker Lendecke2-24/+0
2010-03-14s3: Fix some nonempty blank linesVolker Lendecke5-30/+27
2010-03-13s3: Convert unexpected.tdb to use tdb_wrap_openVolker Lendecke1-10/+12
2010-03-13s3: Make tdb_wrap_open more robustVolker Lendecke2-43/+87
This hides the use of talloc_reference from the caller, making it impossible to wrongly call talloc_free() on the result.
2010-03-13s3-spoolss: wrap _spoolss_EnumPrinterData() around _spoolss_EnumPrinterDataEx().Günther Deschner1-64/+40
This removes some dependencies to registry code. Guenther
2010-03-12Missed a couple more uses of conn->server_info->ptok that need to be ↵Jeremy Allison3-30/+36
get_current_nttok(conn) Centralize the root check into smb1_file_se_access_check() so this is used by modules/vfs_acl_common.c also. Jeremy.
2010-03-12Remove more uses of "extern struct current_user current_user;".Jeremy Allison10-79/+130
Use accessor functions to get to this value. Tidies up much of the user context code. Volker, please look at the changes in smbd/uid.c to familiarize yourself with these changes as I think they make the logic in there cleaner. Cause smbd/posix_acls.c code to look at current user context, not stored context on the conn struct - allows correct use of these function calls under a become_root()/unbecome_root() pair. Jeremy.
2010-03-12s3: Add "net registry increment"Volker Lendecke1-0/+105
A convenience function to increment a DWORD value under a (cluster-wide) lock
2010-03-12s3: Add "g_lock_do" as a convenience wrapper functionVolker Lendecke3-27/+90
2010-03-12s3: Actually use mem_ctx in net_g_lock_init()Volker Lendecke1-3/+3
2010-03-12s3: Fix a commentVolker Lendecke1-1/+1
2010-03-12s3: Fix some "net registry" usage messagesVolker Lendecke1-3/+3