diff --git a/users/views.py b/users/views.py index 044e7fd..b5909d8 100644 --- a/users/views.py +++ b/users/views.py @@ -11,50 +11,77 @@ from .serializers import RegisterSerializer, CustomTokenObtainPairSerializer logger = logging.getLogger(__name__) tracer = trace.get_tracer(__name__) # ✅ 트레이서 생성 + def get_request_info(request): ip = request.META.get("REMOTE_ADDR", "unknown") ua = request.META.get("HTTP_USER_AGENT", "unknown") email = getattr(request.user, "email", "anonymous") return email, ip, ua + class RegisterView(APIView): def post(self, request): - with tracer.start_as_current_span("RegisterView POST"): # ✅ Span 생성 + with tracer.start_as_current_span("RegisterView POST") as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) serializer = RegisterSerializer(data=request.data) if serializer.is_valid(): user = serializer.save() - logger.info(f"[REGISTER] user={user.email} | status=success | IP={ip} | UA={ua}") - return Response({"message": "User registered successfully."}, status=status.HTTP_201_CREATED) - logger.warning(f"[REGISTER] user={email} | status=fail | IP={ip} | UA={ua} | detail={serializer.errors}") + logger.info( + f"[REGISTER] user={user.email} | status=success | IP={ip} | UA={ua}" + ) + # ✅ Jaeger 이벤트 등록 + span.add_event("User registered", attributes={"email": user.email}) + return Response( + {"message": "User registered successfully."}, + status=status.HTTP_201_CREATED, + ) + logger.warning( + f"[REGISTER] user={email} | status=fail | IP={ip} | UA={ua} | detail={serializer.errors}" + ) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + class MeView(APIView): permission_classes = [IsAuthenticated] def get(self, request): - with tracer.start_as_current_span("MeView GET"): # ✅ Span 생성 + with tracer.start_as_current_span("MeView GET") as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) logger.debug(f"[ME GET] user={email} | IP={ip} | UA={ua}") serializer = RegisterSerializer(request.user) + span.add_event( + "Me info retrieved", attributes={"email": email} + ) # ✅ Jaeger 이벤트 등록 return Response(serializer.data) def put(self, request): - with tracer.start_as_current_span("MeView PUT"): # ✅ Span 생성 + with tracer.start_as_current_span("MeView PUT") as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) - serializer = RegisterSerializer(request.user, data=request.data, partial=True) + serializer = RegisterSerializer( + request.user, data=request.data, partial=True + ) if serializer.is_valid(): serializer.save() - logger.info(f"[ME UPDATE] user={email} | status=success | IP={ip} | UA={ua}") + logger.info( + f"[ME UPDATE] user={email} | status=success | IP={ip} | UA={ua}" + ) + span.add_event( + "Me info updated", attributes={"email": email} + ) # ✅ Jaeger 이벤트 등록 return Response(serializer.data) - logger.warning(f"[ME UPDATE] user={email} | status=fail | IP={ip} | UA={ua} | detail={serializer.errors}") + logger.warning( + f"[ME UPDATE] user={email} | status=fail | IP={ip} | UA={ua} | detail={serializer.errors}" + ) return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST) + class CustomTokenObtainPairView(TokenObtainPairView): serializer_class = CustomTokenObtainPairSerializer def post(self, request, *args, **kwargs): - with tracer.start_as_current_span("TokenObtainPairView POST"): # ✅ Span 생성 + with tracer.start_as_current_span( + "TokenObtainPairView POST" + ) as span: # ✅ Span 생성 ip = request.META.get("REMOTE_ADDR", "unknown") ua = request.META.get("HTTP_USER_AGENT", "unknown") email = request.data.get("email", "unknown") @@ -62,78 +89,147 @@ class CustomTokenObtainPairView(TokenObtainPairView): response = super().post(request, *args, **kwargs) if response.status_code == 200: - logger.info(f"[LOGIN] user={email} | status=success | IP={ip} | UA={ua}") + logger.info( + f"[LOGIN] user={email} | status=success | IP={ip} | UA={ua}" + ) + span.add_event( + "Login success", attributes={"email": email} + ) # ✅ Jaeger 이벤트 등록 else: - logger.warning(f"[LOGIN] user={email} | status=fail | IP={ip} | UA={ua} | detail={response.data}") + logger.warning( + f"[LOGIN] user={email} | status=fail | IP={ip} | UA={ua} | detail={response.data}" + ) + span.add_event( + "Login failed", + attributes={"email": email, "reason": str(response.data)}, + ) # ✅ return response + class SSHKeyUploadView(APIView): permission_classes = [IsAuthenticated] def post(self, request): - with tracer.start_as_current_span("SSHKeyUploadView POST"): # ✅ Span 생성 + with tracer.start_as_current_span( + "SSHKeyUploadView POST" + ) as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) private_key = request.data.get("private_key") key_name = request.data.get("key_name") if not private_key or not key_name: - logger.warning(f"[SSH UPLOAD] user={email} | status=fail | reason=missing_key_or_name | IP={ip} | UA={ua}") + logger.warning( + f"[SSH UPLOAD] user={email} | status=fail | reason=missing_key_or_name | IP={ip} | UA={ua}" + ) return Response( {"error": "private_key와 key_name 모두 필요합니다."}, - status=status.HTTP_400_BAD_REQUEST + status=status.HTTP_400_BAD_REQUEST, ) try: user = request.user user.save_private_key(private_key) user.encrypted_private_key_name = key_name - user.save(update_fields=["encrypted_private_key", "encrypted_private_key_name"]) - logger.info(f"[SSH UPLOAD] user={email} | status=success | key_name={key_name} | IP={ip} | UA={ua}") + user.save( + update_fields=[ + "encrypted_private_key", + "encrypted_private_key_name", + ] + ) + logger.info( + f"[SSH UPLOAD] user={email} | status=success | key_name={key_name} | IP={ip} | UA={ua}" + ) + span.add_event( + "SSH key saved", attributes={"email": email, "key_name": key_name} + ) # ✅ return Response({"message": "SSH key 저장 완료."}, status=201) except Exception as e: - logger.exception(f"[SSH UPLOAD] user={email} | status=fail | reason=exception | IP={ip} | UA={ua}") - return Response({"error": f"암호화 또는 저장 실패: {str(e)}"}, status=500) + logger.exception( + f"[SSH UPLOAD] user={email} | status=fail | reason=exception | IP={ip} | UA={ua}" + ) + return Response( + {"error": f"암호화 또는 저장 실패: {str(e)}"}, status=500 + ) def delete(self, request): - with tracer.start_as_current_span("SSHKeyUploadView DELETE"): # ✅ Span 생성 + with tracer.start_as_current_span( + "SSHKeyUploadView DELETE" + ) as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) user = request.user user.encrypted_private_key = None user.encrypted_private_key_name = None user.last_used_at = None - user.save(update_fields=["encrypted_private_key", "encrypted_private_key_name", "last_used_at"]) - logger.info(f"[SSH DELETE] user={email} | status=success | IP={ip} | UA={ua}") + user.save( + update_fields=[ + "encrypted_private_key", + "encrypted_private_key_name", + "last_used_at", + ] + ) + logger.info( + f"[SSH DELETE] user={email} | status=success | IP={ip} | UA={ua}" + ) + span.add_event( + "SSH key deleted", attributes={"email": email} + ) # ✅ Jaeger 이벤트 등록 return Response({"message": "SSH key deleted."}, status=200) + class SSHKeyInfoView(APIView): permission_classes = [IsAuthenticated] def get(self, request): - with tracer.start_as_current_span("SSHKeyInfoView GET"): # ✅ Span 생성 + with tracer.start_as_current_span("SSHKeyInfoView GET") as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) logger.debug(f"[SSH INFO] user={email} | IP={ip} | UA={ua}") user = request.user - return Response({ - "has_key": bool(user.encrypted_private_key), - "encrypted_private_key_name": user.encrypted_private_key_name, - "last_used_at": user.last_used_at - }) + span.add_event( + "SSH key info retrieved", attributes={"email": email} + ) # ✅ Jaeger 이벤트 등록 + return Response( + { + "has_key": bool(user.encrypted_private_key), + "encrypted_private_key_name": user.encrypted_private_key_name, + "last_used_at": user.last_used_at, + } + ) + class SSHKeyRetrieveView(APIView): permission_classes = [IsAuthenticated] def get(self, request): - with tracer.start_as_current_span("SSHKeyRetrieveView GET"): # ✅ Span 생성 + with tracer.start_as_current_span( + "SSHKeyRetrieveView GET" + ) as span: # ✅ Span 생성 email, ip, ua = get_request_info(request) user = request.user if not user.encrypted_private_key: - logger.warning(f"[SSH RETRIEVE] user={email} | status=fail | reason=not_found | IP={ip} | UA={ua}") - return Response({"error": "SSH 키가 등록되어 있지 않습니다."}, status=404) + logger.warning( + f"[SSH RETRIEVE] user={email} | status=fail | reason=not_found | IP={ip} | UA={ua}" + ) + span.add_event( + "SSH key retrieve failed", + attributes={"email": email, "reason": "not_found"}, + ) # ✅ + return Response( + {"error": "SSH 키가 등록되어 있지 않습니다."}, status=404 + ) try: decrypted_key = user.decrypt_private_key() - logger.info(f"[SSH RETRIEVE] user={email} | status=success | IP={ip} | UA={ua}") + logger.info( + f"[SSH RETRIEVE] user={email} | status=success | IP={ip} | UA={ua}" + ) + span.add_event("SSH key retrieved", attributes={"email": email}) # ✅ return Response({"ssh_key": decrypted_key}) except Exception as e: - logger.exception(f"[SSH RETRIEVE] user={email} | status=fail | reason=exception | IP={ip} | UA={ua}") + logger.exception( + f"[SSH RETRIEVE] user={email} | status=fail | reason=exception | IP={ip} | UA={ua}" + ) + span.add_event( + "SSH key retrieve failed", + attributes={"email": email, "reason": str(e)}, + ) # ✅ return Response({"error": f"복호화 실패: {str(e)}"}, status=500) diff --git a/version b/version index 9eddb00..841e451 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.0.11_rc7 \ No newline at end of file +0.0.11_rc8 \ No newline at end of file