mirror of
https://github.com/OpenFusionProject/OpenFusion.git
synced 2025-12-12 00:30:06 +00:00
Gent Semaj
55cf3f7102
This PR enables auth cookies to be used simultaneously with plaintext paasswords sent in the cookie authID field. * Hoist a bunch of checks from the login packet handler into helper functions. * Rename the LoginType enum to AuthMethod and distinguish it from the iLoginType packet field (see comment in code for why these should be decoupled). * If the provided token does not pass the cookie check and password auth is enabled, treat it as a plaintext password and authenticate if it is correct.
71 lines
2.0 KiB
C++
71 lines
2.0 KiB
C++
/*
|
|
* CNStructs.hpp - defines some basic structs & useful methods for packets used by FusionFall based on the version defined
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#ifdef _MSC_VER
|
|
// codecvt_* is deprecated in C++17 and MSVC will throw an annoying warning because of that.
|
|
// Defining this before anything else to silence it.
|
|
#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING
|
|
#endif
|
|
|
|
#include <iostream>
|
|
#include <stdio.h>
|
|
#include <stdint.h>
|
|
#ifndef _MSC_VER
|
|
#include <sys/time.h>
|
|
#else
|
|
// Can't use this in MSVC.
|
|
#include <time.h>
|
|
#endif
|
|
#include <cstring>
|
|
#include <string>
|
|
#include <locale>
|
|
#include <codecvt>
|
|
#include <tuple>
|
|
|
|
// yes this is ugly, but this is needed to zero out the memory so we don't have random stackdata in our structs.
|
|
#define INITSTRUCT(T, x) T x; \
|
|
memset(&x, 0, sizeof(T));
|
|
|
|
#define INITVARPACKET(_buf, _Pkt, _pkt, _Trailer, _trailer) uint8_t _buf[CN_PACKET_BODY_SIZE]; \
|
|
memset(&_buf, 0, CN_PACKET_BODY_SIZE); \
|
|
auto _pkt = (_Pkt*)_buf; \
|
|
auto _trailer = (_Trailer*)(_pkt + 1);
|
|
|
|
// macros to extract fields from instanceIDs
|
|
#define MAPNUM(x) ((x) & 0xffffffff)
|
|
#define PLAYERID(x) ((x) >> 32)
|
|
|
|
// wrapper for U16toU8
|
|
#define ARRLEN(x) (sizeof(x)/sizeof(*x))
|
|
#define AUTOU8(x) std::string((char*)x, ARRLEN(x))
|
|
#define AUTOU16TOU8(x) U16toU8(x, ARRLEN(x))
|
|
|
|
// TODO: rewrite U16toU8 & U8toU16 to not use codecvt
|
|
|
|
std::string U16toU8(char16_t* src, size_t max);
|
|
size_t U8toU16(std::string src, char16_t* des, size_t max); // returns number of char16_t that was written at des
|
|
time_t getTime();
|
|
time_t getTimestamp();
|
|
int timingSafeStrcmp(const char* a, const char* b);
|
|
void terminate(int);
|
|
|
|
// The PROTOCOL_VERSION definition can be defined by the build system.
|
|
#if !defined(PROTOCOL_VERSION)
|
|
#define PROTOCOL_VERSION 104
|
|
#endif
|
|
|
|
#if PROTOCOL_VERSION == 104
|
|
#include "structs/0104.hpp"
|
|
#elif PROTOCOL_VERSION == 728
|
|
#include "structs/0728.hpp"
|
|
#elif PROTOCOL_VERSION == 1013
|
|
#include "structs/1013.hpp"
|
|
#else
|
|
#error Invalid PROTOCOL_VERSION
|
|
#endif
|
|
|
|
sSYSTEMTIME timeStampToStruct(uint64_t time);
|