Skip to content

SDK-166 Modular access control (confine all checks to ServerActor module) #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matthewhammer merged 1 commit into from
Apr 26, 2019
Merged

SDK-166 Modular access control (confine all checks to ServerActor module) #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 57 additions & 41 deletions stdlib/examples/produce-exchange/serverActor.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,7 @@ actor server = {
*/

registrarAddProducer(
producer_public_key : PublicKey,
short_name_: Text,
description_: Text,
region_: RegionId,
Expand All @@ -353,6 +354,7 @@ actor server = {
func(id_:ProducerId):ProducerInfo {
shared {
id=id_:ProducerId;
public_key=producer_public_key;
short_name=short_name_:Text;
description=description_:Text;
region=region_:RegionId;
Expand Down Expand Up @@ -420,6 +422,7 @@ actor server = {
*/

registrarAddRetailer(
retailer_public_key : PublicKey,
short_name_: Text,
description_: Text,
region_: RegionId,
Expand All @@ -429,6 +432,7 @@ actor server = {
func(id_:RetailerId):RetailerInfo {
shared {
id=id_:RetailerId;
public_key=retailer_public_key;
short_name=short_name_:Text;
description=description_:Text;
region=region_:RegionId
Expand Down Expand Up @@ -490,6 +494,7 @@ actor server = {

*/
registrarAddTransporter(
transporter_public_key: PublicKey,
short_name_: Text,
description_: Text,
) : async Result<TransporterId,None> {
Expand All @@ -498,6 +503,7 @@ actor server = {
func(id_:TransporterId):TransporterInfo {
shared {
id=id_:TransporterId;
public_key=transporter_public_key;
short_name=short_name_:Text;
description=description_:Text;
routes=[];
Expand Down Expand Up @@ -560,7 +566,7 @@ actor server = {
*/
producerAddInventory(
public_key: PublicKey,
id: UserId,
id: ProducerId,
prod: ProduceId,
quant:Quantity,
weight:Weight,
Expand All @@ -569,9 +575,12 @@ actor server = {
end: Date,
comments: Text,
) : async Result<InventoryId,ServerErr> {
if (not getModel().isValidPublicKey(#producer(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().
producerAddInventory(
public_key, null, id, prod, quant, weight, ppu, begin, end, comments)
null, id, prod, quant, weight, ppu, begin, end, comments)
};

/**
Expand All @@ -582,7 +591,7 @@ actor server = {
producerUpdateInventory(
public_key: PublicKey,
iid: InventoryId,
id: UserId,
id: ProducerId,
prod: ProduceId,
quant:Quantity,
weight:Weight,
Expand All @@ -591,41 +600,44 @@ actor server = {
end: Date,
comments: Text,
) : async Result<(),ServerErr> {
if (not getModel().isValidPublicKey(#producer(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().
producerUpdateInventory(
public_key, iid, id, prod, quant, weight, ppu, begin, end, comments)
iid, id, prod, quant, weight, ppu, begin, end, comments)
};

/**
`producerRemInventory`
---------------------------
*/
producerRemInventory(public_key: PublicKey, id:InventoryId) : async Result<(),ServerErr> {
getModel()
.producerRemInventory(public_key, id)
if (not getModel().isValidPublicKey(#producer(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().producerRemInventory(id)
};

/**
`producerAllInventoryInfo`
---------------------------
*/
producerAllInventoryInfo(public_key: PublicKey, id:UserId) : async Result<[InventoryInfo],IdErr> {
producerAllInventoryInfo(public_key: PublicKey, id:ProducerId) : async Result<[InventoryInfo],IdErr> {
optionResult<[InventoryInfo],IdErr>(
getModel()
.producerAllInventoryInfo(public_key, id),
{#idErr}
getModel().producerAllInventoryInfo(id),
#idErr
)
};

/**
`producerReservations`
---------------------------
*/
producerReservations(public_key: PublicKey, id:UserId) : async Result<[ReservedInventoryInfo],IdErr> {
producerReservations(public_key: PublicKey, id:ProducerId) : async Result<[ReservedInventoryInfo],IdErr> {
optionResult<[ReservedInventoryInfo],IdErr>(
getModel()
.producerReservations(public_key, id),
{#idErr}
getModel().producerReservations(id),
#idErr
)
};

Expand All @@ -644,8 +656,7 @@ actor server = {
*/
produceMarketInfo(public_key: PublicKey, id:ProduceId, reg:?RegionId) : async Result<[ProduceMarketInfo],IdErr> {
optionResult<[ProduceMarketInfo],IdErr>(
getModel()
.produceMarketInfo(public_key, id, reg),
getModel().produceMarketInfo(id, reg),
{#idErr}
)
};
Expand All @@ -657,8 +668,7 @@ actor server = {
Get the information for all known inventory.
*/
allInventoryInfo() : async [InventoryInfo] {
getModel()
.inventoryTable.allInfo()
getModel().inventoryTable.allInfo()
};

/**
Expand All @@ -668,8 +678,7 @@ actor server = {
*/
getInventoryInfo(id:InventoryId) : async Result<InventoryInfo,IdErr> {
optionResult<InventoryInfo,IdErr>(
getModel()
.inventoryTable.getInfo(id),
getModel().inventoryTable.getInfo(id),
{#idErr}
)
};
Expand All @@ -686,15 +695,18 @@ actor server = {
*/
transporterAddRoute(
public_key: PublicKey,
id: UserId,
id: TransporterId,
rstart: RegionId,
rend: RegionId,
start: Date,
end: Date,
cost: Price,
ttid: TruckTypeId
) : async Result<RouteId,ServerErr> {
getModel().transporterAddRoute(public_key, null, id, rstart, rend, start, end, cost, ttid)
if (not getModel().isValidPublicKey(#transporter(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().transporterAddRoute(null, id, rstart, rend, start, end, cost, ttid)
};

/**
Expand All @@ -704,47 +716,51 @@ actor server = {
transporterUpdateRoute(
public_key: PublicKey,
route: RouteId,
id: UserId,
id: TransporterId,
rstart: RegionId,
rend: RegionId,
start: Date,
end: Date,
cost: Price,
ttid: TruckTypeId
) : async Result<(),ServerErr> {
getModel().transporterUpdateRoute(public_key, route, id, rstart, rend, start, end, cost, ttid)
if (not getModel().isValidPublicKey(#transporter(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().transporterUpdateRoute(route, id, rstart, rend, start, end, cost, ttid)
};

/**
`transporterRemRoute`
---------------------------
*/
transporterRemRoute(public_key: PublicKey, id:RouteId) : async Result<(),ServerErr> {
getModel()
.transporterRemRoute(public_key, id)
if (not getModel().isValidPublicKey(#transporter(id), public_key)) {
return (#err(#publicKeyErr))
};
getModel().transporterRemRoute(id)
};

/**
`transporterAllRouteInfo`
---------------------------
*/
transporterAllRouteInfo(public_key: PublicKey, id:UserId) : async Result<[RouteInfo],IdErr> {
transporterAllRouteInfo(public_key: PublicKey, id:TransporterId) : async Result<[RouteInfo],IdErr> {
optionResult<[RouteInfo],IdErr>(
getModel()
.transporterAllRouteInfo(public_key, id),
{#idErr}
getModel().transporterAllRouteInfo(id),
#idErr
)
};

/**
`transporterAllReservationInfo`
---------------------------
*/
transporterAllReservationInfo(public_key: PublicKey, id:UserId) : async Result<[ReservedRouteInfo],IdErr> {
transporterAllReservationInfo(public_key: PublicKey, id:TransporterId) : async Result<[ReservedRouteInfo],IdErr> {
optionResult<[ReservedRouteInfo],IdErr>(
getModel()
.transporterAllReservationInfo(public_key, id),
{#idErr}
.transporterAllReservationInfo(id),
#idErr
)
};

Expand Down Expand Up @@ -783,13 +799,13 @@ actor server = {
---------------------------

*/
retailerQueryAll(public_key: PublicKey, id:UserId,
retailerQueryAll(public_key: PublicKey, id:RetailerId,
queryProduce:?ProduceId,
queryDate:?Date
) : async Result<QueryAllResults,IdErr> {
optionResult<QueryAllResults,IdErr>(
getModel().
retailerQueryAll(public_key, id, queryProduce, queryDate),
retailerQueryAll(id, queryProduce, queryDate),
{#idErr}
)
};
Expand All @@ -805,14 +821,14 @@ actor server = {
*/
retailerQueryDates(
public_key: PublicKey,
id:UserId,
id:RetailerId,
begin:Date,
end:Date
) : async Result<[InventoryInfo],IdErr>
{
optionResult<[InventoryInfo],IdErr>(
getModel().
retailerQueryDates(public_key, id, begin, end),
retailerQueryDates(id, begin, end),
{#idErr}
)
};
Expand All @@ -823,27 +839,27 @@ actor server = {
*/
retailerReserve(
public_key: PublicKey,
id:UserId,
id:RetailerId,
inventory:InventoryId,
route:RouteId) : async Result<(ReservedInventoryId, ReservedRouteId),ServerErr>
{
getModel().
retailerReserve(public_key, id, inventory, route)
retailerReserve(id, inventory, route)
};

/**
`retailerReservations`
---------------------------

*/
retailerReservations(public_key: PublicKey, id:UserId) :
retailerReservations(public_key: PublicKey, id:RetailerId) :
async Result<[(ReservedInventoryInfo,
ReservedRouteInfo)],ServerErr>
{
optionResult<[(ReservedInventoryInfo,
ReservedRouteInfo)],ServerErr>(
getModel().
retailerAllReservationInfo(public_key, id),
retailerAllReservationInfo(id),
#idErr
)
};
Expand Down
Loading