From 348dad3f1cbc100487e5967615484dc1041da291 Mon Sep 17 00:00:00 2001 From: b33f Date: Tue, 7 Sep 2021 22:27:45 +0100 Subject: [PATCH] +Fermion-v17 --- CHANGELOG.txt | 9 +- Fermion/assets/img/version.png | Bin 3206 -> 3121 bytes Fermion/assets/lang/frida.d.ts | 249 ++++++++++++++++++++++++++------- Fermion/core.js | 2 +- Fermion/package.json | 4 +- Fermion/src/frida.html | 11 +- Fermion/src/proc.html | 81 ++++++++++- Fermion/src/render.js | 31 +++- README.md | 6 +- 9 files changed, 325 insertions(+), 68 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 9d43a27..30341f5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -93,4 +93,11 @@ * Disable contextIsolation for window communications * Bugfix for https://github.com/FuzzySecurity/Fermion/issues/12 * Four new themes: Amy, Oceanic Next, Tomorrow Night Blue, Vibrant Ink -* More minor UI colour changes. I'm still thinking of a full re-design for v2. \ No newline at end of file +* More minor UI colour changes. I'm still thinking of a full re-design for v2. + +-= Fermion v1.7 =- + +* Pre-built release updated to Frida v15.1.1 +* Updated language bindings +* Better process information User/PID/PPID. On devices where "parameters.icons" have a type of RGBA they are drawn to a canvas inline. In my testing Ubuntu did not have icons in which case they are not drawn. The release notes for v15 say that some devices like IOS/Android now return a PNG byte array, currently those are not drawn either, PR's welcome. +* The main UI now has a button which retrieves Device information as per the new specs in the v15 release notes. \ No newline at end of file diff --git a/Fermion/assets/img/version.png b/Fermion/assets/img/version.png index 7029c54a13411e4d083f8757f80967a6d6f54980..de9054b81bdaee2bc4414c8ab4923f7c910b06e9 100644 GIT binary patch delta 3064 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 oBzyZtL_~xWxSNCHMiICC4}=qX7L // Francesco Tamagni // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// Minimum TypeScript Version: 3.5 +// Minimum TypeScript Version: 4.1 /** * Returns a hexdump of the provided ArrayBuffer or NativePointerValue target. @@ -1604,46 +1604,81 @@ declare const NativeFunction: NativeFunctionConstructor; interface NativeFunctionConstructor { - new(address: NativePointerValue, retType: NativeType, argTypes: NativeType[], abiOrOptions?: NativeABI | NativeFunctionOptions): NativeFunction; - readonly prototype: NativeFunction; + new ( + address: NativePointerValue, + retType: RetType, + argTypes: ArgTypes, + abiOrOptions?: NativeABI | NativeFunctionOptions, + ): NativeFunction< + GetNativeFunctionReturnValue, + ResolveVariadic, unknown[]>> + >; + readonly prototype: NativeFunction; } - interface NativeFunction extends NativePointer { - (...args: NativeArgumentValue[]): NativeReturnValue; - apply(thisArg: NativePointerValue | null | undefined, args: NativeArgumentValue[]): NativeReturnValue; - call(thisArg?: NativePointerValue | null, ...args: NativeArgumentValue[]): NativeReturnValue; + interface NativeFunction + extends NativePointer { + (...args: ArgTypes): RetType; + apply(thisArg: NativePointerValue | null | undefined, args: ArgTypes): RetType; + call(thisArg?: NativePointerValue | null, ...args: ArgTypes): RetType; } declare const SystemFunction: SystemFunctionConstructor; interface SystemFunctionConstructor { - new(address: NativePointerValue, retType: NativeType, argTypes: NativeType[], abiOrOptions?: NativeABI | NativeFunctionOptions): SystemFunction; - readonly prototype: SystemFunction; - } - - interface SystemFunction extends NativePointer { - (...args: NativeArgumentValue[]): SystemFunctionResult; - apply(thisArg: NativePointerValue | null | undefined, args: NativeArgumentValue[]): SystemFunctionResult; - call(thisArg?: NativePointerValue | null, ...args: NativeArgumentValue[]): SystemFunctionResult; - } - - type SystemFunctionResult = WindowsSystemFunctionResult | UnixSystemFunctionResult; + new ( + address: NativePointerValue, + retType: RetType, + argTypes: ArgTypes, + abiOrOptions?: NativeABI | NativeFunctionOptions, + ): SystemFunction< + GetNativeFunctionReturnValue, + ResolveVariadic, unknown[]>> + >; + readonly prototype: SystemFunction; + } + + interface SystemFunction + extends NativePointer { + (...args: ArgTypes): SystemFunctionResult; + apply(thisArg: NativePointerValue | null | undefined, args: ArgTypes): SystemFunctionResult; + call(thisArg?: NativePointerValue | null, ...args: ArgTypes): SystemFunctionResult; + } + + type SystemFunctionResult = + | WindowsSystemFunctionResult + | UnixSystemFunctionResult + ; - interface WindowsSystemFunctionResult { - value: NativeReturnValue; + interface WindowsSystemFunctionResult { + value: Value; lastError: number; } - interface UnixSystemFunctionResult { - value: NativeReturnValue; + interface UnixSystemFunctionResult { + value: Value; errno: number; } - declare class NativeCallback extends NativePointer { - constructor(func: NativeCallbackImplementation, retType: NativeType, argTypes: NativeType[], abi?: NativeABI); + declare class NativeCallback< + RetType extends NativeCallbackReturnType, + ArgTypes extends NativeCallbackArgumentType[] | [], + > extends NativePointer { + constructor( + func: NativeCallbackImplementation< + GetNativeCallbackReturnValue, + Extract, unknown[]> + >, + retType: RetType, + argTypes: ArgTypes, + abi?: NativeABI, + ); } - type NativeCallbackImplementation = (this: CallbackContext | InvocationContext, ...params: any[]) => any; + type NativeCallbackImplementation< + RetType extends NativeCallbackReturnValue, + ArgTypes extends NativeCallbackArgumentValue[] | [], + > = (this: CallbackContext | InvocationContext, ...args: ArgTypes) => RetType; interface CallbackContext { /** @@ -1659,11 +1694,125 @@ context: CpuContext; } - type NativeArgumentValue = NativePointerValue | UInt64 | Int64 | number | boolean | any[]; - - type NativeReturnValue = NativePointer | UInt64 | Int64 | number | boolean | any[]; - - type NativeType = string | any[]; + type Variadic = "..."; + + type ResolveVariadic = List extends [Variadic, ...infer Tail] + ? [...Array] + : List extends [infer Head, ...infer Tail] + ? [Head, ...ResolveVariadic] + : []; + + type RecursiveValuesOf = T[keyof T] | Array>; + + type RecursiveKeysOf = keyof T | Array> | []; + + type GetValue = Type[] extends T + ? Value + : T extends keyof Map + ? Map[T] + : { [P in keyof T]: T[P] extends Type ? GetValue : never }; + + // tslint:disable-next-line:interface-over-type-literal + type BaseNativeTypeMap = { + int: number; + uint: number; + long: number; + ulong: number; + char: number; + uchar: number; + float: number; + double: number; + int8: number; + uint8: number; + int16: number; + uint16: number; + int32: number; + uint32: number; + bool: number; + }; + + type NativeFunctionArgumentTypeMap = BaseNativeTypeMap & { + void: undefined; + pointer: NativePointerValue; + size_t: number | UInt64; + ssize_t: number | Int64; + int64: number | Int64; + uint64: number | UInt64; + "...": Variadic; + }; + + type NativeFunctionArgumentValue = RecursiveValuesOf; + + type NativeFunctionArgumentType = RecursiveKeysOf; + + type GetNativeFunctionArgumentValue = GetValue< + NativeFunctionArgumentTypeMap, + NativeFunctionArgumentValue, + NativeFunctionArgumentType, + T + >; + + type NativeFunctionReturnTypeMap = BaseNativeTypeMap & { + // tslint:disable-next-line:void-return + void: void; + pointer: NativePointer; + size_t: UInt64; + ssize_t: Int64; + int64: Int64; + uint64: UInt64; + }; + + type NativeFunctionReturnValue = RecursiveValuesOf; + + type NativeFunctionReturnType = RecursiveKeysOf; + + type GetNativeFunctionReturnValue = GetValue< + NativeFunctionReturnTypeMap, + NativeFunctionReturnValue, + NativeFunctionReturnType, + T + >; + + type NativeCallbackArgumentTypeMap = BaseNativeTypeMap & { + void: undefined; + pointer: NativePointer; + size_t: UInt64; + ssize_t: Int64; + int64: Int64; + uint64: UInt64; + }; + + type NativeCallbackArgumentValue = RecursiveValuesOf; + + type NativeCallbackArgumentType = RecursiveKeysOf; + + type GetNativeCallbackArgumentValue = GetValue< + NativeCallbackArgumentTypeMap, + NativeCallbackArgumentValue, + NativeCallbackArgumentType, + T + >; + + type NativeCallbackReturnTypeMap = BaseNativeTypeMap & { + // tslint:disable-next-line:void-return + void: void; + pointer: NativePointerValue; + size_t: number | UInt64; + ssize_t: number | Int64; + int64: number | Int64; + uint64: number | UInt64; + }; + + type NativeCallbackReturnValue = RecursiveValuesOf; + + type NativeCallbackReturnType = RecursiveKeysOf; + + type GetNativeCallbackReturnValue = GetValue< + NativeCallbackReturnTypeMap, + NativeCallbackReturnValue, + NativeCallbackReturnType, + T + >; type NativeABI = | "default" @@ -3065,27 +3214,27 @@ * through the constructor's second argument. */ declare class CModule { - /** - * Creates a new C module from the provided `code`. - * - * @param code C source code to compile, or a precompiled shared library. - * @param symbols Symbols to expose to the C module. Declare them as `extern`. - * This may for example be one or more memory blocks allocated using - * `Memory.alloc()`, and/or `NativeCallback` values for receiving - * callbacks from the C module. - * @param options Options for customizing the construction. - */ - constructor(code: string | ArrayBuffer, symbols?: CSymbols, options?: CModuleOptions); + /** + * Creates a new C module from the provided `code`. + * + * @param code C source code to compile, or a precompiled shared library. + * @param symbols Symbols to expose to the C module. Declare them as `extern`. + * This may for example be one or more memory blocks allocated using + * `Memory.alloc()`, and/or `NativeCallback` values for receiving + * callbacks from the C module. + * @param options Options for customizing the construction. + */ + constructor(code: string | ArrayBuffer, symbols?: CSymbols, options?: CModuleOptions); - /** - * Eagerly unmaps the module from memory. Useful for short-lived modules - * when waiting for a future garbage collection isn't desirable. - */ - dispose(): void; + /** + * Eagerly unmaps the module from memory. Useful for short-lived modules + * when waiting for a future garbage collection isn't desirable. + */ + dispose(): void; - readonly [name: string]: any; + readonly [name: string]: any; - static builtins: CModuleBuiltins; + static builtins: CModuleBuiltins; } interface CModuleOptions { @@ -3918,7 +4067,7 @@ * @param method Method to implement. * @param fn Implementation. */ - function implement(method: ObjectMethod, fn: AnyFunction): NativeCallback; + function implement(method: ObjectMethod, fn: AnyFunction): NativeCallback; /** * Creates a new class designed to act as a proxy for a target object. diff --git a/Fermion/core.js b/Fermion/core.js index 1b3f7d1..6a25e20 100644 --- a/Fermion/core.js +++ b/Fermion/core.js @@ -8,7 +8,7 @@ function createWindow() { bWin = new BrowserWindow({ contextIsolation: false, width: 1000, - height: 900, + height: 930, frame: false, show: false, backgroundColor: '#464646', diff --git a/Fermion/package.json b/Fermion/package.json index bc664cb..157cb6c 100644 --- a/Fermion/package.json +++ b/Fermion/package.json @@ -1,6 +1,6 @@ { "name": "fermion", - "version": "1.6.0", + "version": "1.7.0", "description": "Fermion is a stand-alone Frida electron tool.", "main": "core.js", "scripts": { @@ -11,7 +11,7 @@ "license": "BSD-3-Clause", "dependencies": { "electron": "13.1.6", - "frida": "15.0.2", + "frida": "15.1.1", "jquery": "^3.4.1", "monaco-editor": "0.17.0", "mutex-promise": "0.1.0" diff --git a/Fermion/src/frida.html b/Fermion/src/frida.html index 6c01ef1..6d92bec 100644 --- a/Fermion/src/frida.html +++ b/Fermion/src/frida.html @@ -33,7 +33,10 @@
  • - + +
    • +
  • +

@@ -218,7 +221,7 @@ var editor = monaco.editor.create(document.getElementById('container'), { value: [ '//-------------------------------------------//', - '// Fermion v1.6 //', + '// Fermion v1.7 //', '// ~b33f //', '//-------------------------------------------//', '', @@ -264,8 +267,8 @@