Migrate to Postgresql for better network handling. Add more user functionality.
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
class Api::EventsController < ApplicationController
|
||||
skip_before_action :verify_authenticity_token
|
||||
allow_unauthenticated_access # Skip normal session auth, use DSN auth instead
|
||||
|
||||
# POST /api/:project_id/events
|
||||
def create
|
||||
@@ -27,8 +28,8 @@ class Api::EventsController < ApplicationController
|
||||
response.headers['X-Sample-Rate'] = current_sampling[:allowed_requests].to_s
|
||||
response.headers['X-Sample-Until'] = current_sampling[:effective_until]
|
||||
|
||||
# Check if agent sent a rule version to compare against
|
||||
client_version = request.headers['X-Rule-Version']&.to_i
|
||||
# Check if agent sent a rule version in the JSON body to compare against
|
||||
client_version = event_data.dig('last_rule_sync')&.to_i
|
||||
|
||||
response_data = {
|
||||
success: true,
|
||||
@@ -40,8 +41,7 @@ class Api::EventsController < ApplicationController
|
||||
if client_version.blank? || client_version != rule_version
|
||||
# Get rules updated since client version
|
||||
if client_version.present?
|
||||
since_time = Time.at(client_version / 1_000_000, client_version % 1_000_000)
|
||||
rules = Rule.where("updated_at > ?", since_time).enabled.sync_order
|
||||
rules = Rule.since(client_version).enabled
|
||||
else
|
||||
# Full sync for new agents
|
||||
rules = Rule.active.sync_order
|
||||
|
||||
@@ -7,6 +7,7 @@ module Api
|
||||
# These endpoints are kept for administrative/debugging purposes only
|
||||
|
||||
skip_before_action :verify_authenticity_token
|
||||
allow_unauthenticated_access # Skip normal session auth, use project key auth instead
|
||||
before_action :authenticate_project!
|
||||
before_action :check_project_enabled
|
||||
|
||||
@@ -23,8 +24,8 @@ module Api
|
||||
}
|
||||
end
|
||||
|
||||
# GET /api/:public_key/rules?since=1730646186272060
|
||||
# Incremental sync - returns rules updated since timestamp (microsecond Unix timestamp)
|
||||
# GET /api/:public_key/rules?since=1730646186
|
||||
# Incremental sync - returns rules updated since timestamp (Unix timestamp in seconds)
|
||||
# GET /api/:public_key/rules
|
||||
# Full sync - returns all active rules
|
||||
def index
|
||||
@@ -69,17 +70,14 @@ module Api
|
||||
end
|
||||
|
||||
def parse_timestamp(timestamp_str)
|
||||
# Parse microsecond Unix timestamp
|
||||
# Parse Unix timestamp in seconds
|
||||
unless timestamp_str.match?(/^\d+$/)
|
||||
raise ArgumentError, "Invalid timestamp format. Expected microsecond Unix timestamp (e.g., 1730646186272060)"
|
||||
raise ArgumentError, "Invalid timestamp format. Expected Unix timestamp in seconds (e.g., 1730646186)"
|
||||
end
|
||||
|
||||
total_microseconds = timestamp_str.to_i
|
||||
seconds = total_microseconds / 1_000_000
|
||||
microseconds = total_microseconds % 1_000_000
|
||||
Time.at(seconds, microseconds)
|
||||
Time.at(timestamp_str.to_i)
|
||||
rescue ArgumentError => e
|
||||
raise ArgumentError, "Invalid timestamp format: #{e.message}. Use microsecond Unix timestamp (e.g., 1730646186272060)"
|
||||
raise ArgumentError, "Invalid timestamp format: #{e.message}. Use Unix timestamp in seconds (e.g., 1730646186)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user