lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

Improve sftp_parse_attr_4().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@591 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-23 09:37:28 +00:00
parent cedc9d71c3
commit fbc6543c83
1 changed files with 151 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

279
libssh/sftp.c
View File

@@ -749,144 +749,167 @@ SFTP_DIR *sftp_opendir(SFTP_SESSION *sftp, const char *path){
return NULL; return NULL;
} }
/* parse the attributes from a payload from some messages */ /*
/* i coded it on baselines from the protocol version 4. */ * Parse the attributes from a payload from some messages. It is coded on
/* please excuse me for the inaccuracy of the code. it isn't my fault, it's sftp draft's one */ * baselines from the protocol version 4.
/* this code is dead anyway ... */ * This code is more or less dead but maybe we need it in future.
/* version 4 specific code */ */
static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, BUFFER *buf, static SFTP_ATTRIBUTES *sftp_parse_attr_4(SFTP_SESSION *sftp, BUFFER *buf,
int expectnames) { int expectnames) {
u32 flags=0; SFTP_ATTRIBUTES *attr;
SFTP_ATTRIBUTES *attr; STRING *owner = NULL;
STRING *owner=NULL; STRING *group = NULL;
STRING *group=NULL; u32 flags = 0;
int ok=0; int ok = 0;
/* unused member variable */ /* unused member variable */
(void) expectnames; (void) expectnames;
attr = malloc(sizeof(SFTP_ATTRIBUTES)); attr = malloc(sizeof(SFTP_ATTRIBUTES));
if (attr == NULL) { if (attr == NULL) {
return NULL; return NULL;
}
ZERO_STRUCTP(attr);
/* This isn't really a loop, but it is like a try..catch.. */
do {
if (buffer_get_u32(buf, &flags) != 4) {
break;
} }
memset(attr,0,sizeof(*attr)); flags = ntohl(flags);
/* it isn't really a loop, but i use it because it's like a try..catch.. construction in C */ attr->flags = flags;
do {
if(buffer_get_u32(buf,&flags)!=4)
break;
flags=ntohl(flags);
attr->flags=flags;
if(flags & SSH_FILEXFER_ATTR_SIZE){
if(buffer_get_u64(buf,&attr->size)!=8)
break;
attr->size=ntohll(attr->size);
}
if(flags & SSH_FILEXFER_ATTR_OWNERGROUP){
if(!(owner=buffer_get_ssh_string(buf)))
break;
if(!(group=buffer_get_ssh_string(buf)))
break;
}
if(flags & SSH_FILEXFER_ATTR_PERMISSIONS){
if(buffer_get_u32(buf,&attr->permissions)!=4)
break;
attr->permissions=ntohl(attr->permissions);
switch (attr->permissions & S_IFMT) { if (flags & SSH_FILEXFER_ATTR_SIZE) {
case S_IFSOCK: if (buffer_get_u64(buf, &attr->size) != 8) {
case S_IFBLK: break;
case S_IFCHR: }
case S_IFIFO: attr->size = ntohll(attr->size);
attr->type = SSH_FILEXFER_TYPE_SPECIAL;
break;
case S_IFLNK:
attr->type = SSH_FILEXFER_TYPE_SYMLINK;
break;
case S_IFREG:
attr->type = SSH_FILEXFER_TYPE_REGULAR;
break;
case S_IFDIR:
attr->type = SSH_FILEXFER_TYPE_DIRECTORY;
break;
default:
attr->type = SSH_FILEXFER_TYPE_UNKNOWN;
break;
}
}
if(flags & SSH_FILEXFER_ATTR_ACCESSTIME){
if(buffer_get_u64(buf,&attr->atime64)!=8)
break;
attr->atime64=ntohll(attr->atime64);
}
if(flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES){
if(buffer_get_u32(buf,&attr->atime_nseconds)!=4)
break;
attr->atime_nseconds=ntohl(attr->atime_nseconds);
}
if(flags & SSH_FILEXFER_ATTR_CREATETIME){
if(buffer_get_u64(buf,&attr->createtime)!=8)
break;
attr->createtime=ntohll(attr->createtime);
}
if(flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES){
if(buffer_get_u32(buf,&attr->createtime_nseconds)!=4)
break;
attr->createtime_nseconds=ntohl(attr->createtime_nseconds);
}
if(flags & SSH_FILEXFER_ATTR_MODIFYTIME){
if(buffer_get_u64(buf,&attr->mtime64)!=8)
break;
attr->mtime64=ntohll(attr->mtime64);
}
if(flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES){
if(buffer_get_u32(buf,&attr->mtime_nseconds)!=4)
break;
attr->mtime_nseconds=ntohl(attr->mtime_nseconds);
}
if(flags & SSH_FILEXFER_ATTR_ACL){
if(!(attr->acl=buffer_get_ssh_string(buf)))
break;
}
if (flags & SSH_FILEXFER_ATTR_EXTENDED){
if(buffer_get_u32(buf,&attr->extended_count)!=4)
break;
attr->extended_count=ntohl(attr->extended_count);
while(attr->extended_count && (attr->extended_type=buffer_get_ssh_string(buf))
&& (attr->extended_data=buffer_get_ssh_string(buf))){
attr->extended_count--;
}
if(attr->extended_count)
break;
}
ok=1;
} while (0);
if(!ok){
/* break issued somewhere */
if(owner)
free(owner);
if(group)
free(group);
if(attr->acl)
free(attr->acl);
if(attr->extended_type)
free(attr->extended_type);
if(attr->extended_data)
free(attr->extended_data);
free(attr);
ssh_set_error(sftp->session,SSH_FATAL,"Invalid ATTR structure");
return NULL;
} }
/* everything went smoothly */
if(owner){ if (flags & SSH_FILEXFER_ATTR_OWNERGROUP) {
attr->owner=string_to_char(owner); if((owner = buffer_get_ssh_string(buf)) == NULL ||
free(owner); (attr->owner = string_to_char(owner)) == NULL) {
break;
}
if ((group = buffer_get_ssh_string(buf)) == NULL ||
(attr->group = string_to_char(group)) == NULL) {
break;
}
} }
if(group){
attr->group=string_to_char(group); if (flags & SSH_FILEXFER_ATTR_PERMISSIONS) {
free(group); if (buffer_get_u32(buf, &attr->permissions) != 4) {
break;
}
attr->permissions = ntohl(attr->permissions);
switch (attr->permissions & S_IFMT) {
case S_IFSOCK:
case S_IFBLK:
case S_IFCHR:
case S_IFIFO:
attr->type = SSH_FILEXFER_TYPE_SPECIAL;
break;
case S_IFLNK:
attr->type = SSH_FILEXFER_TYPE_SYMLINK;
break;
case S_IFREG:
attr->type = SSH_FILEXFER_TYPE_REGULAR;
break;
case S_IFDIR:
attr->type = SSH_FILEXFER_TYPE_DIRECTORY;
break;
default:
attr->type = SSH_FILEXFER_TYPE_UNKNOWN;
break;
}
} }
return attr;
if (flags & SSH_FILEXFER_ATTR_ACCESSTIME) {
if (buffer_get_u64(buf, &attr->atime64) != 8) {
break;
}
attr->atime64 = ntohll(attr->atime64);
}
if (flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES) {
if (buffer_get_u32(buf, &attr->atime_nseconds) != 4) {
break;
}
attr->atime_nseconds = ntohl(attr->atime_nseconds);
}
if (flags & SSH_FILEXFER_ATTR_CREATETIME) {
if (buffer_get_u64(buf, &attr->createtime) != 8) {
break;
}
attr->createtime = ntohll(attr->createtime);
}
if (flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES) {
if (buffer_get_u32(buf, &attr->createtime_nseconds) != 4) {
break;
}
attr->createtime_nseconds = ntohl(attr->createtime_nseconds);
}
if (flags & SSH_FILEXFER_ATTR_MODIFYTIME) {
if (buffer_get_u64(buf, &attr->mtime64) != 8) {
break;
}
attr->mtime64 = ntohll(attr->mtime64);
}
if (flags & SSH_FILEXFER_ATTR_SUBSECOND_TIMES) {
if (buffer_get_u32(buf, &attr->mtime_nseconds) != 4) {
break;
}
attr->mtime_nseconds = ntohl(attr->mtime_nseconds);
}
if (flags & SSH_FILEXFER_ATTR_ACL) {
if ((attr->acl = buffer_get_ssh_string(buf)) == NULL) {
break;
}
}
if (flags & SSH_FILEXFER_ATTR_EXTENDED) {
if (buffer_get_u32(buf,&attr->extended_count) != 4) {
break;
}
attr->extended_count = ntohl(attr->extended_count);
while(attr->extended_count &&
(attr->extended_type = buffer_get_ssh_string(buf)) &&
(attr->extended_data = buffer_get_ssh_string(buf))){
attr->extended_count--;
}
if (attr->extended_count) {
break;
}
}
ok = 1;
} while (0);
if (ok == 0) {
/* break issued somewhere */
string_free(owner);
string_free(group);
string_free(attr->acl);
string_free(attr->extended_type);
string_free(attr->extended_data);
SAFE_FREE(attr->owner);
SAFE_FREE(attr->group);
SAFE_FREE(attr);
ssh_set_error(sftp->session, SSH_FATAL, "Invalid ATTR structure");
return NULL;
}
return attr;
} }
/* Version 3 code. it is the only one really supported (the draft for the 4 misses clarifications) */ /* Version 3 code. it is the only one really supported (the draft for the 4 misses clarifications) */