mirror of
https://github.com/esphome/esphome.git
synced 2025-07-29 22:56:37 +00:00
[api] Add missing USE_API_PASSWORD guards to reduce flash usage (#9899)
This commit is contained in:
parent
11f970edec
commit
da491f7090
@ -1590,10 +1590,12 @@ bool APIConnection::send_buffer(ProtoWriteBuffer buffer, uint8_t message_type) {
|
|||||||
// Do not set last_traffic_ on send
|
// Do not set last_traffic_ on send
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
#ifdef USE_API_PASSWORD
|
||||||
void APIConnection::on_unauthenticated_access() {
|
void APIConnection::on_unauthenticated_access() {
|
||||||
this->on_fatal_error();
|
this->on_fatal_error();
|
||||||
ESP_LOGD(TAG, "%s access without authentication", this->get_client_combined_info().c_str());
|
ESP_LOGD(TAG, "%s access without authentication", this->get_client_combined_info().c_str());
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
void APIConnection::on_no_setup_connection() {
|
void APIConnection::on_no_setup_connection() {
|
||||||
this->on_fatal_error();
|
this->on_fatal_error();
|
||||||
ESP_LOGD(TAG, "%s access without full connection", this->get_client_combined_info().c_str());
|
ESP_LOGD(TAG, "%s access without full connection", this->get_client_combined_info().c_str());
|
||||||
|
@ -228,7 +228,9 @@ class APIConnection : public APIServerConnection {
|
|||||||
}
|
}
|
||||||
uint8_t get_log_subscription_level() const { return this->flags_.log_subscription; }
|
uint8_t get_log_subscription_level() const { return this->flags_.log_subscription; }
|
||||||
void on_fatal_error() override;
|
void on_fatal_error() override;
|
||||||
|
#ifdef USE_API_PASSWORD
|
||||||
void on_unauthenticated_access() override;
|
void on_unauthenticated_access() override;
|
||||||
|
#endif
|
||||||
void on_no_setup_connection() override;
|
void on_no_setup_connection() override;
|
||||||
ProtoWriteBuffer create_buffer(uint32_t reserve_size) override {
|
ProtoWriteBuffer create_buffer(uint32_t reserve_size) override {
|
||||||
// FIXME: ensure no recursive writes can happen
|
// FIXME: ensure no recursive writes can happen
|
||||||
|
@ -860,7 +860,9 @@ class ProtoService {
|
|||||||
virtual bool is_authenticated() = 0;
|
virtual bool is_authenticated() = 0;
|
||||||
virtual bool is_connection_setup() = 0;
|
virtual bool is_connection_setup() = 0;
|
||||||
virtual void on_fatal_error() = 0;
|
virtual void on_fatal_error() = 0;
|
||||||
|
#ifdef USE_API_PASSWORD
|
||||||
virtual void on_unauthenticated_access() = 0;
|
virtual void on_unauthenticated_access() = 0;
|
||||||
|
#endif
|
||||||
virtual void on_no_setup_connection() = 0;
|
virtual void on_no_setup_connection() = 0;
|
||||||
/**
|
/**
|
||||||
* Create a buffer with a reserved size.
|
* Create a buffer with a reserved size.
|
||||||
@ -898,6 +900,7 @@ class ProtoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool check_authenticated_() {
|
bool check_authenticated_() {
|
||||||
|
#ifdef USE_API_PASSWORD
|
||||||
if (!this->check_connection_setup_()) {
|
if (!this->check_connection_setup_()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -906,6 +909,9 @@ class ProtoService {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
#else
|
||||||
|
return this->check_connection_setup_();
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user