diff --git a/src/lib/api/service_helpers/AdminServiceUtils.cpp b/src/lib/api/service_helpers/AdminServiceUtils.cpp index b9a50356e..ebffa69f8 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.cpp +++ b/src/lib/api/service_helpers/AdminServiceUtils.cpp @@ -1145,16 +1145,26 @@ void AdminServiceUtils::validate_user_exchange_data (const bts::api::admin::BTSU } void AdminServiceUtils::get_md_entitlement_report(const AdminData& admin_data, std::vector& entitlements){ - for (const auto& user : admin_data.users()){ - const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user, - admin_data); - if(cme_data!=nullptr){ - for (const auto& cme_mic_data : cme_data->md_permissions()){ - MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, - cme_mic_data); + for (const auto& user : admin_data.users()) + { + const CMEUserData* cme_data=AdminServiceUtils::get_user_cme_data(user, admin_data); + if(cme_data!=nullptr) + { + for (const auto& cme_mic_data : cme_data->md_permissions()) + { + MDEntitlementReportUnit rv=get_cme_md_entitlement_unit(user, cme_mic_data); entitlements.push_back(rv); } } + const ICEUserData* ice_data=AdminServiceUtils::get_user_ice_data(user, admin_data); + if(ice_data!=nullptr) + { + for (const auto& ice_mic_data : ice_data->md_permissions()) + { + MDEntitlementReportUnit rv=get_ice_md_entitlement_unit(user, ice_mic_data); + entitlements.push_back(rv); + } + } } } MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( @@ -1202,6 +1212,22 @@ MDEntitlementReportUnit AdminServiceUtils::get_cme_md_entitlement_unit( rv.set_record_id(key.str()); return rv; } +MDEntitlementReportUnit AdminServiceUtils::get_ice_md_entitlement_unit( + const BTSUser& user, + const ICEMicData& ice_mic_data){ + MDEntitlementReportUnit rv; + rv.set_user(user.name()); + rv.set_user_id(user.id()); + rv.set_exchange( bts::api::Venue_Name(bts::api::Venue::VENUE_ICE) ); + rv.set_mic( bts::api::ICEMics_Name( ice_mic_data.mic()) ); + + rv.set_enabled(ice_mic_data.enabled()); + std::ostringstream key; + key << rv.user() << rv.exchange() << rv.mic(); + rv.set_record_id(key.str()); + return rv; +} + void AdminServiceUtils::get_user_symbol_permissions(const AdminData& data, const BTSUser& user, std::vector& rv){ diff --git a/src/lib/api/service_helpers/AdminServiceUtils.h b/src/lib/api/service_helpers/AdminServiceUtils.h index 3a654548a..2b55f6874 100644 --- a/src/lib/api/service_helpers/AdminServiceUtils.h +++ b/src/lib/api/service_helpers/AdminServiceUtils.h @@ -260,6 +260,9 @@ public: static MDEntitlementReportUnit get_cme_md_entitlement_unit( const BTSUser& user, const CMEMicData& cme_mic_data); + static MDEntitlementReportUnit get_ice_md_entitlement_unit( + const BTSUser& user, + const ICEMicData& ice_mic_data); static void get_user_symbol_permissions( const AdminData& data, const BTSUser& user, diff --git a/src/lib/config/defaults/keycode.conf b/src/lib/config/defaults/keycode.conf index 49832fb86..dd3365479 100644 --- a/src/lib/config/defaults/keycode.conf +++ b/src/lib/config/defaults/keycode.conf @@ -1,9 +1,9 @@ #nusers: 1 -#allow concurrent : false -#expires: 2019-Sep-30 00:00:00 637053984000000000 -#generation_time: 2019-Jun-18 18:25:44.333280 5248650809870720704 +#allow concurrent : true +#expires: 2019-Dec-31 00:00:00 637133472000000000 +#generation_time: 2019-Sep-16 17:50:57.225054 5248728548999638444 EncryptedKeyCode { value { - keycode: "pgtv/OmievnpmNlgxTYuN801Hbetgu7ZGkHnlGWtK+DBrKSEgKxr5lGvCW1ld/jsztkWhKHDh0iediMDjrPm4+C5qmXlt4JJlAFvKolMN8HVC59m82fECvakcqKq28WSEjf6/DuPJNP1ZwxjcmKouxx1LZ15VlNkECtNrC9pkCnifazbfQZGV3kD08zMEyw/RPmOaVLFFeav8lwI5UpcjPYBIK1rJowXdGSvm1CJViwG5Z2JbdHR39QbKjVx112d5VbVtBq9nO3i0FEKvobjN/Gzcz/5x4TgQtEShKsbmgEN+MBVL3AItQlcFzZvE/05JLmfACUFmk5Eu0a3DlLs3A==" + keycode: "E7sUCxYuveyuvvBfwMdTrUCpFROJWQvsy4pYjwZ+zonjHwEmDkjxbxaqUEKqMzBbAq3YFnxIGOrQpRJte71SEoG5FGy4ZoRrVOjrMdNVLmieUWtZU43FKGJzImj/tJKEXu2xgwYJRZTj/AJ8C30PuVnzm0qUmR+UCgCOxKVeK0OFlo6zSqyDutcy5kLW3va+nTuFp43aknm6Iiu8LFW16wa6QDDCSQd4QgnHmiz5wyMC90yGBE4qObTKRGKDl5mWsjEL16aWK2ZO/0/ebFgGG8WygQfkeFzJS7B4q5Ta0nkSkVyLZjq1LN2/g9AXeCzCJUX5/F96kdfsnfSgAJepeg==" } } \ No newline at end of file diff --git a/src/lib/md/relay/QueryServer.cpp b/src/lib/md/relay/QueryServer.cpp index bd636b4c3..22e37e459 100644 --- a/src/lib/md/relay/QueryServer.cpp +++ b/src/lib/md/relay/QueryServer.cpp @@ -78,7 +78,8 @@ struct MDConsumerGroup { symbol(symbol), platform(platform_for_exchange(symbol.exchange())), channel(consumer.get_channel(symbol)), - handles() + handles(), + mic() { set_consumer(consumer); @@ -118,9 +119,34 @@ struct MDConsumerGroup { bts_assert_d(handle.is_initialized()); bts_assert(handle.get_usersymbol() == symbol); DatedHandle h = { TimeStamp::now(), handle }; - handles->push_back(h); + handles->push_back(h); + if(this->mic == "") + set_mic(h); } - + + void set_mic(const DatedHandle& h) + { + if(channel.exchange() == api::VENUE_ICE || channel.exchange() == api::VENUE_SIMICE) + { + this->mic = h.handle.get_normalized_security().ice().mic_code(); + } + else if(channel.exchange() == api::VENUE_GLBX || channel.exchange() == api::VENUE_SIM) + { + const auto& cme_symb_mics = config::get().cme_mic(); + for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++) + { + const auto& micsym = mic->first; + if(micsym == symbol.symbol()) + { + this->mic = api::CMEMics_Name(mic->second); + break; + } + } + } + else + bts_assert_msg(false, "unknown venue in QueryServer"); + } + UserSymbol symbol; Platform platform; MDConsumerChannel channel; @@ -128,7 +154,7 @@ struct MDConsumerGroup { // Can add to handles without invalidating readers (no lock needed) // When we recover we swap a new vector into this unique_ptr and delayed-delete shared_ptr> handles; - + std::string mic; }; void convert(PriceSize ps, PriceSizeMessage* pps) { @@ -222,13 +248,14 @@ public: void fill(const SecurityChannel& chan, MDConsumerGroup& group, ChannelReply* reply, const Entitlements* entitlements, bool bypass_entitlement) const { bts_assert(reply); - bool entitled = bypass_entitlement || chan.exchange() == api::VENUE_BTS || - (chan.exchange() == api::VENUE_GLBX && entitlements && entitlements->count(chan.symbol())); reply->mutable_channel()->CopyFrom(chan); reply->set_platform(group.platform); reply->mutable_channel()->set_time(TimeStamp::now().to_uint64()); - reply->mutable_channel()->set_entitled(entitled); + bool entitled = bypass_entitlement; + if(entitlements && !entitled) + entitled = entitlements->count(group.mic); + reply->mutable_channel()->set_entitled(entitled); auto flags = (MDRequest::Flags)chan.flags(); // Get a copy of handles. If recovery happens during this call @@ -251,12 +278,6 @@ public: auto security = handle.get_normalized_security(); pupd->mutable_security()->CopyFrom(security); snapshot = true; - if(!entitled && (chan.exchange() == api::VENUE_ICE || chan.exchange() == api::VENUE_SIMICE)) - { - entitled = entitlements && entitlements->count("ICE:" + security.ice().mic_code()); - if(entitled) - reply->mutable_channel()->set_entitled(entitled); - } } //if we are not entitled AND this is the first request since we lost our entitlement, zero out books if (!entitled && chan.entitled() ) { @@ -548,44 +569,21 @@ QueryServerPtr run_query_server(const bts::api::ServiceContext& ctx, MDClient& c container->admin_client.subscribe_md_entitlement_data().subscribe([=](const api::admin::Md_entitlement_dataUpdate& update) { const auto& all_updates = update.all(); utils::Dispatcher::background().post([all_updates, container]() - { - const auto& cme_symb_mics = config::get().cme_mic(); + { auto entitlements = std::make_shared>(); for (const auto& row : all_updates) { if (row && row->enabled()) { - for(auto mic=cme_symb_mics.begin();mic!=cme_symb_mics.end();mic++) - { - if(api::CMEMics_Name(mic->second) == row->mic()) - { - const auto& symbol = mic->first; - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert(symbol); - ents.insert("SIM:" + symbol); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert(symbol); - iter->second.insert("SIM:" + symbol); - } - } - } - api::ICEMics icemic; - if(api::ICEMics_Parse(row->mic(), &icemic)) //this is an ice mic, just put the mic in the set and resolve later - { - auto iter = entitlements->find(row->user_id()); - if (iter == entitlements->end()) { - Entitlements ents; - ents.insert("ICE:" + row->mic()); - entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); - } - else { - iter->second.insert("ICE:" + row->mic()); - } + auto iter = entitlements->find(row->user_id()); + if (iter == entitlements->end()) { + Entitlements ents; + ents.insert(row->mic()); + entitlements->insert(iter, std::make_pair(row->user_id(), std::move(ents))); } + else { + iter->second.insert(row->mic()); + } } } container->relay.update_entitlements(entitlements); diff --git a/src/lib/utils/AuthToken.cpp b/src/lib/utils/AuthToken.cpp index 9c062c592..2ea9034ac 100644 --- a/src/lib/utils/AuthToken.cpp +++ b/src/lib/utils/AuthToken.cpp @@ -76,6 +76,14 @@ bool requires_auth_session(const admin::BTSUser& user) return true; } } + if(user.user_data().exchange_user_data().has_ice_data()) + { + for(const auto& i: user.user_data().exchange_user_data().ice_data().md_permissions()) + { + if(i.enabled()) + return true; + } + } } return false; } diff --git a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h index e4f4d1083..b73cf1c49 100644 --- a/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h +++ b/src/server/sparkd/md/platforms/ice_onixs/ICEListener.h @@ -216,11 +216,18 @@ void ICEListener::on_uds_future_spread(const Definition& def, bool& is_intereste for(size_t x = 0; x < fsec.leg_count(); ++x) { const auto& leg = legs[x]; - if(leg.ratioPriceNumerator) - fsec.legs[x].leg_price = double_of_price(leg.ratioPriceNumerator.value(), leg.ratioPriceDenominator.value()); - + if(leg.ratioPriceNumerator && leg.ratioPriceDenominator) + { + auto num = *leg.ratioPriceNumerator; + auto denom = *leg.ratioPriceDenominator; + fsec.legs[x].leg_price = num / (double) denom; + } if(leg.ratioQtyNumerator && leg.ratioQtyDenominator) - fsec.legs[x].leg_delta = double_of_price(leg.ratioQtyNumerator.value(), leg.ratioQtyDenominator.value()); + { + auto num = *leg.ratioQtyNumerator; + auto denom = *leg.ratioQtyDenominator; + fsec.legs[x].leg_delta = num / (double) denom; + } fsec.legs[x].leg_quantity = leg.ratio; fsec.legs[x].leg_side = leg.side == onixs_ice::Side::Bid ? api::SIDE_BUY : api::SIDE_SELL;