Address issues from CR.

Co-authored-by: Michael Hansen <zrax0111@gmail.com>
H-uru · Feb 20, 2024 · 4e17321 · 4e17321
1 parent ac7a10e
commit 4e17321
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 15 deletions.
diff --git a/AuthServ/AuthServer.cpp b/AuthServ/AuthServer.cpp
@@ -586,7 +586,7 @@ void cb_fileList(AuthServer_Private& client)
             return true;
         };
         try {
-            SDL::DescriptorDb::ForDescriptorFiles(DS::Settings::SdlPath(), populateSdl);
+            SDL::DescriptorDb::ForDescriptorFiles(DS::Settings::SdlPath(), std::move(populateSdl));
             result = DS::e_NetSuccess;
         } catch (const DS::SystemError& err) {
             fputs(err.what(), stderr);
@@ -644,9 +644,9 @@ void cb_downloadStart(AuthServer_Private& client)
         filename = DS::Settings::AuthRoot() + filename;
     }
 
-    std::unique_ptr<DS::Stream> stream = std::make_unique<DS::FileStream>();
+    auto fileStream = std::make_unique<DS::FileStream>();
     try {
-        static_cast<DS::FileStream*>(stream.get())->open(filename.c_str(), "rb");
+        fileStream->open(filename.c_str(), "rb");
     } catch (const DS::FileIOException& ex) {
         ST::printf(stderr, "[Auth] Could not open file {}: {}\n[Auth] Requested by {}\n",
                    filename, ex.what(), DS::SockIpAddress(client.m_sock));
@@ -659,23 +659,27 @@ void cb_downloadStart(AuthServer_Private& client)
     }
 
     // All auth downloads must be encrypted.
-    if (!DS::EncryptedStream::CheckEncryption(stream.get()).has_value()) {
-        std::unique_ptr<DS::Stream> bufStream = std::make_unique<DS::BufferStream>();
+    std::unique_ptr<DS::Stream> stream;
+    if (!DS::EncryptedStream::CheckEncryption(fileStream.get()).has_value()) {
+        auto bufStream = std::make_unique<DS::BufferStream>();
         {
             DS::EncryptedStream encStream(bufStream.get(), DS::EncryptedStream::Mode::e_write,
                                           DS::EncryptedStream::Type::e_xxtea,
                                           DS::Settings::DroidKey());
             uint8_t buf[CHUNK_SIZE];
-            while (stream->tell() < stream->size()) {
-                ssize_t nread = stream->readBytes(buf, sizeof(buf));
+            while (fileStream->tell() < fileStream->size()) {
+                ssize_t nread = fileStream->readBytes(buf, sizeof(buf));
                 DS_ASSERT(nread >= 0);
                 encStream.writeBytes(buf, nread);
             }
         }
         bufStream->seek(0, SEEK_SET);
         stream = std::move(bufStream);
+    } else {
+        stream = std::move(fileStream);
     }
 
+    DS_ASSERT(stream);
     client.m_buffer.write<uint32_t>(DS::e_NetSuccess);
     client.m_buffer.write<uint32_t>(stream->size());
     client.m_buffer.write<uint32_t>(stream->tell());

diff --git a/SDL/DescriptorDb.cpp b/SDL/DescriptorDb.cpp
@@ -117,7 +117,7 @@ bool SDL::DescriptorDb::ForLatestDescriptors(descfunc_t functor)
     return true;
 }
 
-bool SDL::DescriptorDb::ForDescriptorFiles(const char* sdlpath, const filefunc_t& functor)
+bool SDL::DescriptorDb::ForDescriptorFiles(const char* sdlpath, filefunc_t functor)
 {
     dirent** dirls;
     int count = scandir(sdlpath, &dirls, &sel_sdl, &alphasort);

diff --git a/SDL/DescriptorDb.h b/SDL/DescriptorDb.h
@@ -106,7 +106,7 @@ namespace SDL
         static StateDescriptor* FindDescriptor(const ST::string& name, int version);
         static StateDescriptor* FindLatestDescriptor(const ST::string& name);
         static bool ForLatestDescriptors(descfunc_t functor);
-        static bool ForDescriptorFiles(const char* sdlpath, const filefunc_t& functor);
+        static bool ForDescriptorFiles(const char* sdlpath, filefunc_t functor);
 
     private:
         DescriptorDb() = delete;

diff --git a/SDL/SdlParser.cpp b/SDL/SdlParser.cpp
@@ -44,6 +44,7 @@ bool SDL::Parser::open(const char* filename)
         m_fileStream->open(filename, "r");
     } catch (DS::FileIOException& ex) {
         ST::printf(stderr, "[SDL] Error opening file {} for reading: {}\n", filename, ex.what());
+        close();
         return false;
     }
 

diff --git a/streams.cpp b/streams.cpp
@@ -308,9 +308,7 @@ DS::EncryptedStream::EncryptedStream(
     switch (mode) {
     case Mode::e_read:
         base->readBytes(header, sizeof(header));
-        if (memcmp(header, "whatdoyousee", 12) == 0)
-            m_type = DS::EncryptedStream::Type::e_tea;
-        else if (memcmp(header, "BriceIsSmart", 12) == 0)
+        if (memcmp(header, "whatdoyousee", 12) == 0 || memcmp(header, "BriceIsSmart", 12) == 0)
             m_type = DS::EncryptedStream::Type::e_tea;
         else if (memcmp(header, "notthedroids", 12) == 0)
             m_type = DS::EncryptedStream::Type::e_xxtea;
@@ -330,6 +328,14 @@ DS::EncryptedStream::EncryptedStream(
 
 DS::EncryptedStream::~EncryptedStream()
 {
+    close();
+}
+
+void DS::EncryptedStream::close()
+{
+    if (m_base == nullptr)
+        return;
+
     if (m_mode == Mode::e_write) {
         if (m_pos % sizeof(m_buffer) != 0)
             cryptFlush();
@@ -344,6 +350,8 @@ DS::EncryptedStream::~EncryptedStream()
         }
         m_base->write<uint32_t>(m_size);
     }
+
+    m_base = nullptr;
 }
 
 std::optional<DS::EncryptedStream::Type> DS::EncryptedStream::CheckEncryption(const char* filename)
@@ -362,9 +370,7 @@ std::optional<DS::EncryptedStream::Type> DS::EncryptedStream::CheckEncryption(DS
     stream->readBytes(header, sizeof(header));
     stream->seek(pos, SEEK_SET);
 
-    if (memcmp(header, "whatdoyousee", sizeof(header)) == 0)
-        return DS::EncryptedStream::Type::e_tea;
-    if (memcmp(header, "BriceIsSmart", sizeof(header)) == 0)
+    if (memcmp(header, "whatdoyousee", sizeof(header)) == 0 || memcmp(header, "BriceIsSmart", sizeof(header)) == 0)
         return DS::EncryptedStream::Type::e_tea;
     if (memcmp(header, "notthedroids", sizeof(header)) == 0)
         return DS::EncryptedStream::Type::e_xxtea;

diff --git a/streams.h b/streams.h
@@ -316,6 +316,8 @@ namespace DS
         static std::optional<Type> CheckEncryption(const char* filename);
         static std::optional<Type> CheckEncryption(DS::Stream* stream);
 
+        void close();
+
         Type getEncType() const { return m_type; }
         void setKeys(const uint32_t* keys);
 
@@ -327,6 +329,9 @@ namespace DS
         uint32_t size() const override { return m_size; }
         bool atEof() override { return m_pos == m_size; }
         void flush() override { m_base->flush(); }
+
+        EncryptedStream& operator =(const EncryptedStream& copy) = delete;
+        EncryptedStream& operator =(EncryptedStream&& move) = delete;
     };
 }