IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

update docker for more efficiency build and allow cookie readed from js

Browse Source
This commit is contained in:
einhornimmond 2021-02-26 20:36:33 +01:00 committed by Ulf Gebhardt
parent fa999cde6f
commit b0d413c1e2
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Dockerfile.debug
View File

@ -34,7 +34,9 @@ COPY --from=protoc_build /protobuf/src/google/protobuf/*.h /usr/include/google/p
RUN mkdir -p ${DOCKER_WORKDIR} RUN mkdir -p ${DOCKER_WORKDIR}
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
COPY . . COPY ./dependencies ./dependencies
COPY ./conanfile.txt ./conanfile.txt
RUN ls -la RUN ls -la
RUN cd dependencies/iroha-ed25519 && \ RUN cd dependencies/iroha-ed25519 && \
ls -la && \ ls -la && \
@ -49,11 +51,11 @@ RUN cd dependencies/mariadb-connector-c && \
cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF .. cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_SSL=OFF ..
RUN chmod +x compile_proto.sh #RUN chmod +x compile_proto.sh
RUN chmod +x compile_pot.sh #RUN chmod +x compile_pot.sh
RUN ls -la #RUN ls -la
RUN ./compile_pot.sh #RUN ./compile_pot.sh
RUN ./compile_proto.sh #RUN ./compile_proto.sh
RUN mkdir build && \ RUN mkdir build && \
cd build && \ cd build && \
conan install .. --build=missing -s build_type=Debug conan install .. --build=missing -s build_type=Debug
@ -84,10 +86,16 @@ RUN apt-get update && \
#COPY --from=debug_preparation /code /code #COPY --from=debug_preparation /code /code
#COPY --from=debug_preparation /home/conan /home/conan #COPY --from=debug_preparation /home/conan /home/conan
#RUN ls -la /home/conan/.conan #RUN ls -la /home/conan/.conan
COPY . .
WORKDIR ${DOCKER_WORKDIR} WORKDIR ${DOCKER_WORKDIR}
#RUN ls -la #RUN ls -la
#RUN cat build/conanbuildinfo.cmake #RUN cat build/conanbuildinfo.cmake
RUN chmod +x compile_proto.sh
RUN chmod +x compile_pot.sh
#RUN ls -la
RUN ./compile_pot.sh
RUN ./compile_proto.sh
RUN cd build && \ RUN cd build && \
cmake -DCMAKE_BUILD_TYPE=Debug .. && \ cmake -DCMAKE_BUILD_TYPE=Debug .. && \
make -j$(grep processor /proc/cpuinfo | wc -l) make -j$(grep processor /proc/cpuinfo | wc -l)
@ -100,12 +108,12 @@ FROM ubuntu:latest as login_server_debug
WORKDIR "/usr/bin" WORKDIR "/usr/bin"
RUN apt-get update && \ #RUN apt-get update && \
apt-get install -y --no-install-recommends gdb && \ # apt-get install -y --no-install-recommends gdb && \
apt-get autoclean && \ # apt-get autoclean && \
apt-get autoremove && \ # apt-get autoremove && \
apt-get clean && \ # apt-get clean && \
rm -rf /var/lib/apt/lists/* # rm -rf /var/lib/apt/lists/*
VOLUME /var/log/grd_login VOLUME /var/log/grd_login
@ -120,4 +128,5 @@ EXPOSE 1201
#CMD ["sleep 5", "/usr/bin/Gradido_LoginServer"] #CMD ["sleep 5", "/usr/bin/Gradido_LoginServer"]
#RUN chmod +x ./start_after_mysql.sh #RUN chmod +x ./start_after_mysql.sh
#ENTRYPOINT ["/usr/bin/Gradido_LoginServer"] #ENTRYPOINT ["/usr/bin/Gradido_LoginServer"]
CMD gdb -ex=r Gradido_LoginServer #CMD gdb -ex=r Gradido_LoginServer
CMD Gradido_LoginServer

3
src/cpp/model/Session.cpp
View File

@ -1110,7 +1110,8 @@ Poco::Net::HTTPCookie Session::getLoginCookie()
{ {
auto keks = Poco::Net::HTTPCookie("GRADIDO_LOGIN", std::to_string(mHandleId)); auto keks = Poco::Net::HTTPCookie("GRADIDO_LOGIN", std::to_string(mHandleId));
// prevent reading or changing cookie with js // prevent reading or changing cookie with js
keks.setHttpOnly(); // keks.setHttpOnly();
keks.setPath("/"); keks.setPath("/");
// send cookie only via https, on linux, except in test builds // send cookie only via https, on linux, except in test builds
#ifndef WIN32 #ifndef WIN32